Commit Graph

  • 581b368223 Merge branch 'master' into topic/fbxNodeChainFix Malcolm Tyrrell 2019-08-16 10:08:38 +01:00
  • 812397d681 Merge pull request #2597 from rogersachan/patch-1 Kim Kulling 2019-08-16 08:53:17 +02:00
  • 84e9d9ddf8 Merge branch 'master' into topic/fbxNodeChainFix Kim Kulling 2019-08-16 08:47:02 +02:00
  • 25dcef2758 Create FUNDING.yml Roger 2019-08-16 00:11:12 -04:00
  • a9b4909a2f Merge branch 'master' into patch-1 Kim Kulling 2019-08-14 21:21:18 +02:00
  • 3309ea9a5c Merge pull request #2545 from RichardTea/collada_zae Kim Kulling 2019-08-14 21:20:20 +02:00
  • a2ee19e86d Merge branch 'master' into collada_zae Kim Kulling 2019-08-14 20:02:53 +02:00
  • 578fccf522 Merge remote-tracking branch 'upstream/master' Rich ard 2019-08-13 10:03:44 +01:00
  • 3d0775eebc respect export flag if aiJoinIdenticalVertices is not needed ywang 2019-08-12 18:10:43 -07:00
  • 172422460c Merge pull request #2568 from panquez/master Kim Kulling 2019-08-11 12:30:58 +02:00
  • 02812f22af Merge branch 'master' into master Kim Kulling 2019-08-10 10:08:15 +02:00
  • 563ec1662c Merge pull request #2578 from petrmohelnik/glTF-2.0-Lights-import Kim Kulling 2019-08-10 10:07:20 +02:00
  • 51923b5d3c Merge branch 'master' into glTF-2.0-Lights-import Kim Kulling 2019-08-10 08:35:10 +02:00
  • 4580c56504 Merge pull request #2590 from assimp/kimkulling-issue_2570 Kim Kulling 2019-08-10 07:36:34 +02:00
  • 4c1e8fe9c3 Update config.h.in Kim Kulling 2019-08-09 20:30:12 +02:00
  • cc8e7dcc1b Merge branch 'master' into glTF-2.0-Lights-import Kim Kulling 2019-08-09 20:03:51 +02:00
  • 7d67eca52c Merge pull request #2574 from gongminmin/RemoveStdIterator Kim Kulling 2019-08-09 20:03:24 +02:00
  • f1f409d538 Merge branch 'master' into RemoveStdIterator Kim Kulling 2019-08-09 17:43:30 +02:00
  • 3c7a608956 Add an include. Malcolm Tyrrell 2019-08-09 16:26:59 +01:00
  • 181d3dd84f Fix node chain bug. Malcolm Tyrrell 2019-08-09 15:28:14 +01:00
  • 5b81899302 Add failing test. Malcolm Tyrrell 2019-08-09 15:24:18 +01:00
  • 8761f3c67a add pugi to include. Kim Kulling 2019-08-08 22:07:06 +02:00
  • 2d7505b244 Merge branch 'master' into glTF-2.0-Lights-import Kim Kulling 2019-08-08 21:57:32 +02:00
  • 1097f47ff5 Merge pull request #2585 from RevoluPowered/feature/fix-armature-and-root-node Kim Kulling 2019-08-08 21:56:08 +02:00
  • 74d2eb842b Fixed armature being marked as 'limbnode' Gordon MacPherson 2019-08-07 22:38:33 +01:00
  • 090e896ebf Merge branch 'master' into collada_zae Kim Kulling 2019-08-06 21:22:02 +02:00
  • 42f07c8bbc Merge pull request #2536 from thomasbiang/fix_export_group_as_bone Kim Kulling 2019-08-06 21:21:35 +02:00
  • 9f5b047f7c Merge branch 'master' into fix_export_group_as_bone Kim Kulling 2019-08-06 19:27:37 +02:00
  • 9330cca1cd glTF 2.0 Lights import petrmohelnik 2019-08-03 20:51:00 +02:00
  • 83d2ec7f74 Merge branch 'master' into RemoveStdIterator Kim Kulling 2019-08-02 10:35:59 +02:00
  • 1e6eac9e65 Fix error when building assimp on older Mac OS X version. follower 2019-08-02 04:44:21 +12:00
  • 1c3e934ae9 Merge pull request #2563 from mosra/stl-white-ambient Kim Kulling 2019-07-30 14:16:09 +02:00
  • cfbe368d72 Remove the usage of std::iterator Minmin Gong 2019-07-29 22:33:42 -07:00
  • deee43f946 Merge branch 'master' into stl-white-ambient Kim Kulling 2019-07-29 19:31:33 +02:00
  • 7b67b00a79 Merge pull request #17 from assimp/master RichardTea 2019-07-29 12:27:05 +01:00
  • 1d565b0aab Merge pull request #2566 from RichardTea/test_exporter_ids Kim Kulling 2019-07-29 10:09:28 +02:00
  • d83af91095 Update Exporter.cpp Kim Kulling 2019-07-29 09:03:29 +02:00
  • 762e039d15 Merge branch 'master' into test_exporter_ids Kim Kulling 2019-07-28 22:20:57 +02:00
  • 69265273c2 Merge pull request #2572 from thomasbiang/fix-multiUV-export Kim Kulling 2019-07-28 11:13:31 +02:00
  • 7d74a3354d Merge branch 'master' into fix-multiUV-export Kim Kulling 2019-07-28 09:37:00 +02:00
  • 361609c60b Merge branch 'master' into test_exporter_ids RichardTea 2019-07-26 22:21:16 +01:00
  • 7fc4cf1552 ASSIMP_BUILD_NO_*_EXPORTER RichardTea 2019-07-26 22:17:24 +01:00
  • 94328695d0 Merge branch 'master' into fix_export_group_as_bone Kim Kulling 2019-07-26 11:00:04 +02:00
  • 73914cd7e2 Update FBXExporter.cpp Kim Kulling 2019-07-26 10:55:28 +02:00
  • 982914754e Merge pull request #2564 from RichardTea/test_gitignore_cleanup Kim Kulling 2019-07-26 10:47:20 +02:00
  • 72e18ed4aa Fix Travis CI sign-compare warning RichardTea 2019-07-26 09:10:09 +01:00
  • d8eaf0bc7f cleanup empty lines ywang 2019-07-25 15:53:57 -07:00
  • a6b06ad811 update ywang 2019-07-15 15:52:45 -07:00
  • aaaa0a02a3 use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00
  • 0f0454c3b7 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • f9f408690e use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00
  • 2ddb00f4e0 clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • 029338940c customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • 0ed9158908 update ywang 2019-07-15 15:52:45 -07:00
  • 6e6765cae3 clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • c597e21b67 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • 9b2aac8c96 use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00
  • 079e522eae clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • 8fc899035c customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • 5a7c226c30 set->unordered_set;unsigned int for iteration thomasbiang 2019-07-10 09:51:20 -07:00
  • 57a56b7b1d extra layer for multi uv sets ywang 2019-07-25 13:14:54 -07:00
  • 337df20209 Update CMakeLists.txt Pierre Anquez 2019-07-25 17:12:16 +02:00
  • 80047cd633 Update Exporter.cpp Pierre Anquez 2019-07-25 16:29:17 +02:00
  • a879102309 Update CMakeLists.txt Pierre Anquez 2019-07-25 16:27:35 +02:00
  • 9dce8e40ba Update CMakeLists.txt Pierre Anquez 2019-07-25 16:03:26 +02:00
  • 7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id RichardTea 2019-07-25 13:38:49 +01:00
  • e993cdc309 Merge branch 'master' into collada_zae RichardTea 2019-07-25 12:42:08 +01:00
  • 59a5343a1a Merge branch 'master' into test_gitignore_cleanup RichardTea 2019-07-25 12:41:30 +01:00
  • 9880db8d4d Merge pull request #16 from assimp/master RichardTea 2019-07-25 12:38:29 +01:00
  • e05ece2eec Add Exporter Unit Test output to gitignore RichardTea 2019-07-25 11:12:06 +01:00
  • 9b78060a4a Add copyright headers to ZipArchiveIOSystem RichardTea 2019-07-25 10:14:42 +01:00
  • 3016f3a725 Convert Q3BSP Importer to use ZipArchiveIOSystem RichardTea 2019-07-25 10:13:53 +01:00
  • 5c6ea5d7ba Fix memory leak in Collada ZAE and 3MF ZipFile reading RichardTea 2019-07-25 09:54:39 +01:00
  • 9e04df810e ZipArchiveIOSystem should be sorted, fix ZipFile::Read() RichardTea 2019-07-25 09:53:18 +01:00
  • dadf5c0020 Fix white ambient in STL loader. Vladimír Vondruš 2019-07-25 10:28:09 +02:00
  • d1b206a8ea Merge pull request #2558 from panquez/patch-1 Kim Kulling 2019-07-24 22:05:02 +02:00
  • c6620478ec Fix GCC warnings reported by Travis RichardTea 2019-07-24 16:12:06 +01:00
  • 17adc98eec Fix issue #2557 Pierre Anquez 2019-07-23 15:58:30 +02:00
  • e828dd1757 Merge branch 'master' into collada_zae Kim Kulling 2019-07-21 14:37:12 +02:00
  • 46a8164af4 Merge pull request #2543 from thomasbiang/fix_export_custom_bindpose_error Kim Kulling 2019-07-21 14:36:24 +02:00
  • 78b283135e Update utIssues.cpp Kim Kulling 2019-07-21 13:32:31 +02:00
  • db3bb22933 Xml: Prepare replacement of irrXml. Kim Kulling 2019-07-21 12:19:19 +02:00
  • 5895f04391 Merge branch 'master' into fix_export_custom_bindpose_error Kim Kulling 2019-07-21 12:17:02 +02:00
  • 41ea607739 Merge branch 'master' into collada_zae Kim Kulling 2019-07-20 14:12:18 +02:00
  • 5b6fe80883 Merge pull request #2550 from merwaaan/fix-obj-line-continuation Kim Kulling 2019-07-20 14:08:08 +02:00
  • ff7ec7e454 Merge branch 'master' into fix-obj-line-continuation Kim Kulling 2019-07-20 12:07:49 +02:00
  • 4bd8ae8211 Merge pull request #2552 from assimp/fix_new_compiler_warnings Kim Kulling 2019-07-20 12:07:32 +02:00
  • 103048ff85 Update UnrealLoader.h Kim Kulling 2019-07-20 10:10:17 +02:00
  • f804036cf3 Update utBlenderWork.cpp Kim Kulling 2019-07-19 20:44:48 +02:00
  • b6616e7b79 Fix another signed unsigned comparison warning. kimkulling 2019-07-19 13:28:00 +02:00
  • e84f961f78 change std::array<int, x > to std::array<unsigned int, x> to fix compiler warnings. kimkulling 2019-07-19 13:03:08 +02:00
  • 68520bff0c Fix another signed / unsigned comparison warning. kimkulling 2019-07-19 11:55:12 +02:00
  • 3416c04ad9 Unit: fix more compiler warnings. kimkulling 2019-07-19 11:26:48 +02:00
  • a8019cf8d8 Unit: Fix new compiler warnings. kkulling 2019-07-19 10:38:44 +02:00
  • 2f6a005fb8 Add unit test for OBJ line continuations Merwan 2019-07-17 18:19:17 +02:00
  • 03b58e84c3 Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error ywang 2019-07-16 13:37:25 -07:00
  • e1e9d92c01 update ywang 2019-07-15 15:52:45 -07:00
  • e3683e49e4 clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • 5121a835b5 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • 6299c58fae use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00