Commit Graph

  • abc6b9ce4c ifdef fixes to fix MSVC warnings Rahul Sheth 2020-07-14 14:07:36 -04:00
  • 209a61d0e7 Update hunter and utf8cpp inclusion Rahul Sheth 2020-07-14 13:55:37 -04:00
  • 84e342acd7 DefaultIOStream: Remove assert on empty count Ryan Styrczula 2020-07-14 10:39:18 -04:00
  • b19ebf5d54 Fix merge conflicts. Kim Kulling 2020-07-14 09:02:14 +02:00
  • 8cfd2a4cc1 Migrate OgreSerializer. Kim Kulling 2020-07-14 09:00:06 +02:00
  • 67a710efad Merge pull request #3320 from IOBYTE/master Kim Kulling 2020-07-13 22:10:12 +02:00
  • f5d5d7c5ed Merge branch 'master' into master Kim Kulling 2020-07-13 20:35:24 +02:00
  • bdcad5cd0a Merge pull request #3292 from rmstyrczula/master Kim Kulling 2020-07-13 20:32:44 +02:00
  • 0c2f7a119c FBXExporter: Forgot WritePropColor defaultValue Ryan Styrczula 2020-06-22 15:22:08 -04:00
  • 6619ec8253 FBXExporter: Use scene metadata for global settings Ryan Styrczula 2020-06-22 14:26:37 -04:00
  • c8d759de64 Merge branch 'master' into master Kim Kulling 2020-07-12 19:11:02 +02:00
  • aff5bba9da Merge pull request #3289 from ifiddynine/patch-1 Kim Kulling 2020-07-12 19:05:55 +02:00
  • 78d0b81b6c Merge branch 'master' into patch-1 Kim Kulling 2020-07-12 18:54:34 +02:00
  • 411bf89b64 Merge pull request #3323 from assimp/LoicFr-master Kim Kulling 2020-07-12 18:52:38 +02:00
  • eaac92830a Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master Kim Kulling 2020-07-12 12:05:34 +02:00
  • a9a0c30932 Build viewer and publish artifacts on windows-msvc. Andrew Johnson 2020-06-19 00:15:12 -07:00
  • 231447c8d6 Merge pull request #3227 from thomasbiang/gltf2_sparseAccessor_export Kim Kulling 2020-07-11 23:06:47 +02:00
  • b1dd77fbbc Merge branch 'master' into gltf2_sparseAccessor_export Kim Kulling 2020-07-11 22:57:31 +02:00
  • ec156e4da3 Merge pull request #3280 from thomasbiang/extras_property_callback Kim Kulling 2020-07-11 22:56:38 +02:00
  • 306e03d497 Merge branch 'master' into extras_property_callback Kim Kulling 2020-07-11 22:46:19 +02:00
  • 108b3a62e5 Update Exporter.hpp Kim Kulling 2020-07-11 22:45:45 +02:00
  • 1324b4b27d Merge pull request #3321 from assimp/kimkulling-patch-7 Kim Kulling 2020-07-11 22:43:44 +02:00
  • b8ec93aa21 use c-styl cast in a c-file Kim Kulling 2020-07-11 22:34:43 +02:00
  • 2cd1192bf1 Merge pull request #3300 from mahiuchun/strrchr Kim Kulling 2020-07-11 21:19:55 +02:00
  • 9682ab0685 Merge branch 'master' into strrchr Kim Kulling 2020-07-11 21:10:58 +02:00
  • 21678df589 ogre + collada migration. Kim Kulling 2020-07-10 22:25:38 +02:00
  • 1379175f18 Merge pull request #3314 from assimp/issue_3252 Kim Kulling 2020-07-09 09:50:32 +02:00
  • 628394baec check for invalid vertex Robert Reif 2020-07-07 23:29:54 -04:00
  • d79a617e18 Rollup to 'upstream/master' RichardTea 2020-07-07 20:02:46 +01:00
  • 9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. kimkulling 2020-07-07 17:35:03 +02:00
  • 37c74f6fa3 add test to unit for acc file format loader Robert Reif 2020-07-06 20:16:22 -04:00
  • f753a6e7ad add acc file test using existing ac file converted to acc format Robert Reif 2020-07-06 20:14:03 -04:00
  • 6c29247180 add triangle strip support to AC file loader Robert Reif 2020-07-06 17:41:14 -04:00
  • fb11705dd0 Merge branch 'master' into gltf1_gltf2_split Max Vollmer (Microsoft Havok) 2020-07-06 09:11:06 +01:00
  • abf43eaf74 * Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently. * ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before Max Vollmer 2020-07-05 19:22:31 +01:00
  • a211aff522 Merge pull request #3307 from MalcolmTyrrell/defsIncludeFix Kim Kulling 2020-07-05 20:20:23 +02:00
  • d04f8b3174 Merge branch 'master' into defsIncludeFix Kim Kulling 2020-07-05 18:59:37 +02:00
  • 95a23af16f Merge pull request #3309 from mahiuchun/const Kim Kulling 2020-07-04 21:22:42 +02:00
  • 77b705048b fix merge issues. Kim Kulling 2020-07-04 13:42:23 +02:00
  • 839986ca14 next step of AMF-Migration. Kim Kulling 2020-07-04 09:04:06 +02:00
  • 3fb7747429 Improve ToBinary() for double precision. Hill Ma 2020-07-03 18:14:45 -07:00
  • d74c10dcb7 Merge branch 'master' into pugi_xml Kim Kulling 2020-07-03 17:29:38 +02:00
  • 10c709831f Merge pull request #3306 from assimp/issue_3305 Kim Kulling 2020-07-02 17:46:53 +02:00
  • 51150cb3df Ensure asserts are defined where expected. Malcolm Tyrrell 2020-07-02 14:53:29 +01:00
  • 693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. Kim Kulling 2020-07-02 15:22:06 +02:00
  • b1369d0912 next steps. Kim Kulling 2020-07-02 15:18:59 +02:00
  • 9e27fb3b89 Rollup to upstream/master RichardTea 2020-07-01 16:28:00 +01:00
  • 7b7764afb9 Merge pull request #3301 from mahiuchun/double Kim Kulling 2020-06-30 21:24:35 +02:00
  • 7fda533484 Merge branch 'master' into double Kim Kulling 2020-06-30 21:12:02 +02:00
  • dea412c9a0 Merge pull request #3303 from malortie/fix-loop-variable-HL1MDLLoader Kim Kulling 2020-06-30 21:11:32 +02:00
  • 97085c1c05 update sync Yingying Wang 2020-06-30 11:48:37 -07:00
  • 36f899bf09 sync update Yingying Wang 2020-06-30 11:45:11 -07:00
  • 3f2e5518eb update sync Yingying Wang 2020-06-30 11:29:08 -07:00
  • 03340787ec Fixed variable in loop - HL1MDLLoader.cpp Marc-Antoine Lortie 2020-06-29 07:50:51 -04:00
  • 4ff5a06ef4 Merge pull request #3302 from assimp/kimkulling-patch-6 Kim Kulling 2020-06-29 12:52:19 +02:00
  • 1ab7a3a16b Merge branch 'master' into kimkulling-patch-6 Kim Kulling 2020-06-29 10:36:09 +02:00
  • 718f81ddcf Merge pull request #3293 from ifiddynine/patch-2 Kim Kulling 2020-06-29 10:35:41 +02:00
  • eeb4a981bd Merge branch 'master' into patch-2 Kim Kulling 2020-06-29 09:55:55 +02:00
  • 9a87338854 Update Readme.md Kim Kulling 2020-06-29 09:55:29 +02:00
  • 28b65c84b0 Create fileformats.md Kim Kulling 2020-06-29 09:52:36 +02:00
  • ba94bfd197 Move patreon to contribution Kim Kulling 2020-06-29 09:51:00 +02:00
  • 30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on. Hill Ma 2020-06-28 17:36:21 -07:00
  • 0b18d27042 Use strrchr() when finding the '.' that begins the file extension. Hill Ma 2020-06-28 15:58:20 -07:00
  • 879ff365fc Merge pull request #3299 from assimp/rename_fuzz_target Kim Kulling 2020-06-28 19:27:26 +02:00
  • b2f05a9a54 rename fuzzer target Kim Kulling 2020-06-28 19:18:36 +02:00
  • fb20e15163 start to migrate colladat and amf Kim Kulling 2020-06-27 15:57:06 +02:00
  • 45531df9aa Merge pull request #3298 from Evangel63/recursive_metadata Kim Kulling 2020-06-27 15:52:16 +02:00
  • 6d85280c8d Added bool, removed unused debug parameter Evangel 2020-06-27 12:53:26 +10:00
  • d75d59a4fd Added operator== and operator!= to aiMetadata to allow for testing. Updated utMetadata.copy_test to reflect that there's now 8 metadata types. Evangel 2020-06-26 15:07:42 +10:00
  • f6b4370f6a Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented. Evangel 2020-06-26 14:26:45 +10:00
  • b7b38c2282 Merge branch 'master' into patch-2 Kim Kulling 2020-06-25 16:52:40 +02:00
  • 8a57d5df40 Merge pull request #3294 from rmstyrczula/FindInvalidData Kim Kulling 2020-06-25 16:50:51 +02:00
  • ba6af9ff98 Merge branch 'master' into FindInvalidData Kim Kulling 2020-06-25 16:41:24 +02:00
  • 50b55726d2 Merge pull request #3297 from MalcolmTyrrell/aiAssertHandler Kim Kulling 2020-06-25 14:15:32 +02:00
  • 95e822a6ec Merge branch 'master' into aiAssertHandler Kim Kulling 2020-06-24 20:47:10 +02:00
  • e845988c22 Merge pull request #3296 from assimp/replace_NULL Kim Kulling 2020-06-24 20:45:50 +02:00
  • 1466bbacf8 fix unittests. Kim Kulling 2020-06-24 20:30:02 +02:00
  • 170c00eee7 Useful comment. Malcolm Tyrrell 2020-06-24 11:51:03 +01:00
  • edaa8e4a80 Need to use ASSIMP_BUILD_DEBUG. Malcolm Tyrrell 2020-06-24 11:37:43 +01:00
  • ae05dbb252 define CheckValidFacesIndices also in release builds. Kim Kulling 2020-06-23 21:11:18 +02:00
  • 6205af4efb replace NULL and avoid ai_assert with more than 2 tests. Kim Kulling 2020-06-23 21:05:42 +02:00
  • 2977643352 Fix. Malcolm Tyrrell 2020-06-23 12:08:06 +01:00
  • 9188f56839 Allow assert handling to be replaced. Malcolm Tyrrell 2020-06-23 11:55:51 +01:00
  • 5717ea466f FindInvalidDataProcess: Mark removed meshes as "out" Ryan Styrczula 2020-06-22 17:19:26 -04:00
  • 2006286528 Fix Maya PBR & stingray texture detection Filip Lundgren 2020-06-22 23:14:16 +02:00
  • ba09e1ef94 Fix Blender .fbx metalness detection Filip Lundgren 2020-06-21 23:56:11 +02:00
  • 6397bfbf90 replace NULL by nullptr on loadFile. Kim Kulling 2020-06-21 12:03:38 +02:00
  • c70d57be4f Merge pull request #3288 from infosia/themachinery-issues-0001 Kim Kulling 2020-06-20 21:40:18 +02:00
  • 6acaaee80f Check invalid vertex id for bone weight Kota Iguchi 2020-06-20 15:27:28 +09:00
  • c2a732938e Merge pull request #3287 from assimp/issue_3253 Kim Kulling 2020-06-18 20:01:03 +02:00
  • b3af5c5a14 closes https://github.com/assimp/assimp/issues/3253 : remove useless code Kim Kulling 2020-06-17 20:37:39 +02:00
  • 4cd7e48f19 Merge pull request #3284 from assimp/kimkulling-patch-6 Kim Kulling 2020-06-17 09:04:24 +02:00
  • bb613df543 Update issue templates Kim Kulling 2020-06-16 16:31:47 +02:00
  • f776cc8008 Merge pull request #3248 from assimp/issue_3165 Kim Kulling 2020-06-15 21:44:22 +02:00
  • 524e2e4728 fix warning, hopefully ... kimkulling 2020-06-15 21:34:49 +02:00
  • f0f6612b81 disable warning for radjson. kimkulling 2020-06-15 20:52:11 +02:00
  • 31b8d4710f Merge branch 'master' into issue_3165 Kim Kulling 2020-06-15 20:32:00 +02:00
  • e6d5af6d76 Merge pull request #3267 from thomasbiang/gltf2_targetNames_export Kim Kulling 2020-06-14 09:57:10 +02:00
  • 15f11aec93 Merge branch 'master' into gltf2_targetNames_export Kim Kulling 2020-06-14 09:43:09 +02:00
  • 094b808880 Merge pull request #3279 from assimp/migenius-migenius-fix-texcoord Kim Kulling 2020-06-12 15:04:51 +02:00