Commit Graph

11723 Commits (94d977354804608d29281a7e3e940b71aa148865)

Author SHA1 Message Date
Kim Kulling 89ac168014 ogre: fix warning: not inited variable. 2020-09-27 21:23:55 +02:00
Kim Kulling 1c85676a9c collada: fix warning: not inited variable. 2020-09-27 21:19:23 +02:00
Kim Kulling 052cc2e070 collada: fix warning: not inited variable. 2020-09-27 21:16:51 +02:00
Kim Kulling 5038f21d06 collada: fix warning: not inited variable. 2020-09-27 21:14:21 +02:00
Kim Kulling 202907d471 collada: fix warning: unused variable. 2020-09-27 21:11:42 +02:00
Kim Kulling 3f97a1df2c collada: fix warning: unused variable. 2020-09-27 21:09:06 +02:00
Kim Kulling bdd3c96eee amf: fix warning: unused variable. 2020-09-27 21:06:14 +02:00
Kim Kulling 5877f81419 amf: fix warning: unused variable. 2020-09-27 21:03:59 +02:00
Kim Kulling 5230b91611 amf: fix warning: unused variable. 2020-09-27 21:01:48 +02:00
Kim Kulling 8143ea5aec amf: fix warning: unused variable. 2020-09-27 20:58:08 +02:00
Kim Kulling 9a19a4723b amf: fix warning: unused variable. 2020-09-27 20:54:21 +02:00
Kim Kulling a6b90c354b fix pugi warnings 2020-09-27 20:38:09 +02:00
Kim Kulling 5653a82a87 fix the unittests. 2020-09-27 20:20:44 +02:00
Kim Kulling 9234fee35e Ogre: fix xml migration. 2020-09-27 09:36:38 +02:00
Sherief Farouk a3c8cfc0ff Fix for build break due to warnings-as-errors when not building M3D exporter. 2020-09-26 23:21:23 -07:00
Kim Kulling d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling 557273818d collada: next iteration. 2020-09-23 21:23:12 +02:00
Kim Kulling 22dd53a4a2
Merge pull request #3394 from ms-maxvollmer/gltfBufferViewSizeFix
GLTF2: Throw instead of assert when input file is invalid.
2020-09-23 21:22:14 +02:00
Kim Kulling 34351b3cb9 fix collada material parsing. 2020-09-23 00:20:06 +02:00
Kim Kulling c0e58c1895
Merge branch 'master' into gltfBufferViewSizeFix 2020-09-22 20:02:16 +02:00
Kim Kulling 93ae409e74 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-22 17:29:49 +02:00
Kim Kulling 6e91605268 reformat. 2020-09-22 17:29:46 +02:00
kimkulling 71f20eaa8a next fixes 2020-09-22 15:51:21 +02:00
kimkulling dee8e5bee1 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-22 15:20:35 +02:00
Kim Kulling c4039d5cf0 fix collada data parsing. 2020-09-21 20:05:16 +02:00
kimkulling 8c88526da8 fix collada unittests. 2020-09-21 16:39:24 +02:00
Kim Kulling 11261671a3
Merge pull request #3400 from assimp/kimkulling-patch-7
Update Readme.md
2020-09-20 19:56:38 +02:00
Kim Kulling 3e025cdc8d
Update Readme.md 2020-09-20 18:33:02 +02:00
Kim Kulling 64c1405dfd
Merge pull request #3382 from rbsheth/rbsheth_hunter_rapidjson
Fix RapidJSON defines and add Hunter builds to CI
2020-09-19 21:37:16 +02:00
Max Vollmer (Microsoft Havok) c9fb21661f
Merge branch 'master' into gltfBufferViewSizeFix 2020-09-18 08:01:24 +01:00
rahulshethsc 354e09e785
Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-17 14:39:04 -04:00
Rahul Sheth aa125c48ab Try fixing required action names 2020-09-17 14:38:49 -04:00
Kim Kulling fbc0914a21
Merge pull request #3383 from crocdialer/collada_animation_ticks_per_sec_issue_3162
collada: set aiAnimation->mTicksPerSecond to 1000.0
2020-09-17 14:37:55 +02:00
Fabian Schmidt 338c0b753c
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-16 21:43:35 +02:00
Max Vollmer (Microsoft Havok) 9c1edaee96
Merge branch 'master' into gltfBufferViewSizeFix 2020-09-16 10:08:47 +01:00
Kim Kulling 14d6141f69 Collada: fix scenenode parsing. 2020-09-14 21:35:36 +02:00
Kim Kulling 9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-14 09:00:11 +02:00
Kim Kulling 3e5feb4320
Merge pull request #3375 from MalcolmTyrrell/makeInternalErrorsAccessible
Make internal errors accessible
2020-09-14 08:59:09 +02:00
Kim Kulling 2901f68668
Adapt code style. 2020-09-14 08:45:18 +02:00
Kim Kulling 0e9621012c
Adapt code style - finally :-). 2020-09-14 08:43:31 +02:00
Kim Kulling 1ff9e2b522
Adapt code style. 2020-09-14 08:40:21 +02:00
Kim Kulling 23defc275a
Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
kimkulling d0932c405f fix duplicated node parsing. 2020-09-11 15:46:46 +02:00
Kim Kulling c1f50e116a fix next unittests. 2020-09-11 00:46:29 +02:00
Kim Kulling 31f3812241 XGL: fix import of node values. 2020-09-10 21:03:02 +02:00
kimkulling 6ec07e4dc7 XGL: next steps. 2020-09-10 17:31:30 +02:00
kimkulling cca9eddb1c Fix material-base AMF-unittest. 2020-09-10 13:56:04 +02:00
Max Vollmer 615ffdf93f What: Throw instead of assert when input file is invalid.
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00
kkulling c2f0bf68af Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-10 11:02:51 +02:00
Kim Kulling d854f3b842 AMF: fix adding for child-nodes. 2020-09-10 00:05:53 +02:00