Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,233 Commits 19 Branches 43 Tags
6d26e91fc17c78531e129f66f92fe5c8ebcd7112
Commit Graph

11233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
6d26e91fc1 Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 09:28:39 +02:00
Kim Kulling
245cd66d11 Merge pull request #4605 from assimp/kimkulling/fix_memleak_in_xmlparser 
Fix a memory leak
 2022-07-03 08:33:27 +02:00
Kim Kulling
636d8bffe5 Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser 2022-07-02 21:32:24 +02:00
Kim Kulling
9063216893 Fix a memory leak 2022-07-02 21:21:31 +02:00
Kim Kulling
43f060663f Merge pull request #4601 from assimp/kimkulling/fix_mingw_compilation_issue4586 
Use mingw.include
 2022-06-30 21:46:55 +02:00
Kim Kulling
55625d1af5 Use mingw.include 2022-06-30 20:58:34 +02:00
Kim Kulling
be700a0480 Merge pull request #4598 from assimp/kimkulling/fix-win32-build-with-no-dxsdk9-issue4593 
Disable build for tools per default
 2022-06-29 15:20:41 +02:00
Kim Kulling
eee6269cd1 Diable build for tools per default 
- closes https://github.com/assimp/assimp/issues/4593
 2022-06-29 11:15:29 +02:00
Luca Della Vedova
0924c4710b Fix nested animation name being lost in Collada 
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
 2022-06-29 11:09:54 +08:00
Kim Kulling
e1e8477732 Merge pull request #4596 from assimp/kimkulling/fix_invalid_opengex_token_match 
Kimkulling/fix invalid opengex token match
 2022-06-28 20:59:37 +02:00
Kim Kulling
96ccaa03a0 Merge branch 'master' into kimkulling/fix_invalid_opengex_token_match 2022-06-28 20:39:54 +02:00
Kim Kulling
f76be1a631 Replace debug code by a real test 2022-06-28 20:38:36 +02:00
kimmi
3d692c72ba Fix name of test 2022-06-28 20:31:55 +02:00
kimmi
d3c8201614 Fix token match string checks. 2022-06-28 20:31:03 +02:00
Kim Kulling
b6f3c8eb15 Merge pull request #4595 from assimp/kimkulling/fix-doc 
Update name of package
 2022-06-28 18:04:22 +02:00
Kim Kulling
2de95c77a4 Update name of package 
- closes https://github.com/assimp/assimp/issues/4594
 2022-06-28 17:48:06 +02:00
Kim Kulling
33b672288c Merge pull request #4542 from hgdagon/master 
Fix GNUC check on Windows
 2022-06-24 11:02:25 +02:00
Kim Kulling
5598356157 Merge branch 'master' into master 2022-06-24 09:56:09 +02:00
Kim Kulling
6cebe2c1f1 Merge pull request #4581 from Gargaj/w32fix 
Fix Windows 32-bit builds
 2022-06-24 09:04:47 +02:00
Kim Kulling
855537f232 Merge branch 'master' into master 2022-06-24 09:04:37 +02:00
Kim Kulling
be2e6a1b24 Merge branch 'master' into w32fix 2022-06-24 08:31:41 +02:00
Kim Kulling
038ae8c028 Merge pull request #4585 from onurtore/otore19/sandbox 
Utilizies AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES flag for Collada meshes.
 2022-06-23 16:03:02 +02:00
Onur Berk Töre
b392ff5ad1 Merge branch 'master' into otore19/sandbox 2022-06-21 21:34:50 +03:00
Onur Berk Tore
4f06c41802 Fix: Collada header updated 2022-06-21 21:08:11 +03:00
Kim Kulling
3f3f4dc6b7 Merge pull request #4534 from tanolino/patch-2 
Inifinite loop on bad import files
 2022-06-21 14:01:18 +02:00
Gargaj
bca5650578 fix windows 32 bit builds 2022-06-21 13:40:49 +02:00
Kim Kulling
fff74a4ac0 Merge branch 'master' into patch-2 2022-06-21 13:39:23 +02:00
Kim Kulling
ad2a1546eb Merge pull request #4584 from kovacsv/delete_unused_variable 
Remove unused variable.
 2022-06-21 13:38:08 +02:00
Onur Berk Tore
c2060a1f7e Deletion: Removed unnessary header 2022-06-20 23:48:00 +03:00
Onur Berk Tore
1b53f41787 Feature: Utilizes removeEmptyBones flag for Collada 2022-06-20 23:46:29 +03:00
kovacsv
2486a681c1 Remove unused variable. 2022-06-20 21:07:34 +02:00
Kim Kulling
67fe6643c3 Merge pull request #4578 from PercentBoat4164/master 
Add support for GCC v12
 2022-06-20 00:03:59 +02:00
PercentBoat4164
487a9aca2f Add support for GCC v12 2022-06-16 19:23:55 -04:00
hgdagon
ce8081bd0a Merge branch 'master' into master 2022-06-13 00:15:31 +04:00
Kim Kulling
b8812d2b4f Merge pull request #4552 from assimp/kimkulling/create_skeleton_data_issue_4015 
[Experimental] New skeleton container for bones
 2022-06-11 21:57:41 +02:00
Kim Kulling
5adea2dbcf Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6 Fix merge conflicts 2022-06-11 18:50:18 +02:00
Kim Kulling
0768a13057 Merge pull request #4567 from assimp/kimkulling/fix_nullptr_exception_opnglb_export_issue4418 
Fix  possible nullptr exception
 2022-06-08 08:13:16 +02:00
Kim Kulling
02b0c89fa4 Fix usage of validation 2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6 Fix possible nullptr exception 
- closes https://github.com/assimp/assimp/issues/4418
 2022-06-07 23:33:56 +02:00
Kim Kulling
34cb936844 Merge pull request #4546 from matthewclendening/fix_FBXConverter_double_precision 
Fixed FBXConverter build error when using double precision
 2022-06-07 22:30:33 +02:00
Kim Kulling
b9fdf6d3ca Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-07 22:08:56 +02:00
Kim Kulling
bc2786d830 Merge pull request #4564 from ethaninfinity/master 
Pragma warnings cause build fail with MinGW
 2022-06-07 22:08:03 +02:00
Kim Kulling
e7daa5759b Merge branch 'master' into master 2022-06-07 22:01:00 +02:00
Kim Kulling
7a64f751ab Merge branch 'master' into master 2022-06-07 21:29:33 +02:00
Kim Kulling
988b5c1f36 Merge pull request #4565 from assimp/kimkulling-create-security-vulnerability 
Create SECURITY.md
 2022-06-07 21:10:44 +02:00
Kim Kulling
096aee2c25 Create SECURITY.md 
- Prepare a first contact point for security vulnerability
 2022-06-07 20:58:45 +02:00
ethaninfinity
d018c3b555 Added back pragma warnings and changed to be MSVC-specific 2022-06-07 11:42:09 -04:00
ethaninfinity
c5b6b26b8b Revert "Removed pragma warnings" 
This reverts commit 4961241c09.
 2022-06-07 11:27:12 -04:00
ethaninfinity
4961241c09 Removed pragma warnings 2022-06-06 14:53:03 -04:00