Commit Graph

  • e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. Paul Arden 2019-10-16 19:06:57 +11:00
  • 8a4c35598e Merge pull request #8 from assimp/master ardenpm 2019-10-16 15:22:33 +11:00
  • 17eb292d73 Tests: Fix signed/unsigned warnings RichardTea 2019-10-14 14:49:57 +01:00
  • f4bd11279f Update Collada ZAE tests to include encoded URIs RichardTea 2019-10-14 12:25:42 +01:00
  • 198bc428fa Fix some warnings in Collada import RichardTea 2019-10-14 12:15:02 +01:00
  • d371a113fa /DEBUG:FULL is not a compiler flag RichardTea 2019-10-14 12:10:47 +01:00
  • 6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() RichardTea 2019-10-14 11:27:34 +01:00
  • 5e84889724 Merge branch 'master' into collada_zae_textures_2710 RichardTea 2019-10-14 10:56:53 +01:00
  • d3ddf8de60 Merge branch 'master' into mingw-fix-2685 Kim Kulling 2019-10-12 11:24:33 +02:00
  • 799fd74714 Merge pull request #2708 from assimp/cleanup_headers Kim Kulling 2019-10-11 20:34:54 +02:00
  • ce5c71d2e7 Collada ZAE import must convert manifest and image paths RichardTea 2019-10-11 18:57:38 +01:00
  • 059ee0e091 Update assimp legal and version RichardTea 2019-10-11 16:28:14 +01:00
  • 3c3549a07a Merge branch 'master' into cleanup_headers Kim Kulling 2019-10-11 14:25:00 +02:00
  • 14f8877a2c Merge pull request #2677 from mdinim/master Kim Kulling 2019-10-11 13:44:43 +02:00
  • 3f38011e86 Fix filter for vs for public headers. kimkulling 2019-10-11 13:41:13 +02:00
  • 33af183bb8 Cleanup the public headers. kimkulling 2019-10-11 13:27:36 +02:00
  • 789a2bdd36 Move stuff into def.h kkulling 2019-10-11 09:47:31 +02:00
  • f03f744dfc Merge branch 'master' into master Kim Kulling 2019-10-10 15:59:12 +02:00
  • 3a6648734c Merge pull request #2699 from feniksa/master Kim Kulling 2019-10-09 14:54:07 +02:00
  • 2102f7e79c Merge branch 'master' into master Kim Kulling 2019-10-09 11:51:16 +02:00
  • 927276f1e8 Merge pull request #2706 from assimp/enginmanap-issue_2693 Kim Kulling 2019-10-09 11:50:07 +02:00
  • 1c3f734cd6 Merge branch 'master' into issue_2693 Kim Kulling 2019-10-08 20:25:58 +02:00
  • 3b3e34c36a Fix one byte memory leak. Malcolm Tyrrell 2019-10-08 15:15:16 +01:00
  • f8bdb77de1 Remove unneeded file Malcolm Tyrrell 2019-10-08 14:27:00 +01:00
  • 4cde72b4e6 Add unit tests. Malcolm Tyrrell 2019-10-08 13:05:05 +01:00
  • 5f8f5c3292 Organize test models better. Malcolm Tyrrell 2019-10-08 12:51:31 +01:00
  • 5a1276032e Add bound checks. Malcolm Tyrrell 2019-10-08 12:51:08 +01:00
  • ce4cb39302 Make example minimal. Malcolm Tyrrell 2019-10-08 11:46:07 +01:00
  • 8498310fa0 A gltf v2 which exercises all the options. Malcolm Tyrrell 2019-10-08 11:35:03 +01:00
  • 77ebc53f1f Offset nodes. Malcolm Tyrrell 2019-10-08 10:44:17 +01:00
  • 1e7d1ffbc2 Add non-indexed unit test. Malcolm Tyrrell 2019-10-08 10:34:08 +01:00
  • 63a047119f Findassimp.cmake: add hint for include path's for Linux Maksym Sditanov 2019-10-07 22:07:51 +03:00
  • ed5d38b975 Merge branch 'master' into master Kim Kulling 2019-10-07 20:49:47 +02:00
  • b8006cb4c9 Findassimp.cmake: add hint for lib search path for Linux Maksym Sditanov 2019-10-07 21:41:38 +03:00
  • 165b36c1fc Merge pull request #2692 from escherstair/add_VS2013_VS2019 Kim Kulling 2019-10-07 15:09:12 +02:00
  • c63f5b2f9e removed unused lines escherstair 2019-10-07 11:38:45 +02:00
  • 128602f29b fixed fatal error escherstair 2019-10-07 10:12:40 +02:00
  • 97e060c428 added CMAKE_GENERATOR_PLATFORM escherstair 2019-10-07 09:34:02 +02:00
  • ecd413c86c Update utVersion.cpp Kim Kulling 2019-10-06 20:19:59 +02:00
  • 6ac8279977 assimpTargets.cmake: define add_library() with lib type directly Robikz 2019-10-06 18:46:51 +02:00
  • 0761530e17 Set proper sharedLibraryName for MinGW in installed assimpTargets-*.cmake Robikz 2019-10-06 18:46:47 +02:00
  • 81d125a2cc dllexport ASSIMP_API in all Windows compilers, not just MSVC Robikz 2019-10-06 18:46:35 +02:00
  • 32781a566d Fix FBXConverter: use proper 64-bit constant Fabrice Fontaine 2019-10-06 15:42:11 +02:00
  • c443092c44 Merge branch 'master' into add_VS2013_VS2019 Kim Kulling 2019-10-06 11:12:15 +02:00
  • 78cfec41ec Merge branch 'master' into issue_2693 Kim Kulling 2019-10-06 11:11:22 +02:00
  • d2476e9cda Merge pull request #2675 from vcebollada/gltf_mesh_morph_animations Kim Kulling 2019-10-06 09:08:24 +02:00
  • afec2e2c49 Fix #2693 aiGetVersionMajor return wrong version Engin Manap 2019-10-05 19:23:02 +02:00
  • 38153748ab ColladaExporter: use actual mesh names when available Chris Weermann (TGE) 2019-10-02 19:18:48 +02:00
  • f2a70ad10c remove VS2013 build escherstair 2019-10-02 10:43:06 +02:00
  • d0e8f5ca32 add cmake generators for VS2013 and VS2019 escherstair 2019-10-02 10:30:50 +02:00
  • 19fddb0861 Merge branch 'master' into add_VS2013_VS2019 escherstair 2019-10-02 10:24:52 +02:00
  • 9c326e6989 Add AppVeyor build VS2013 and VS2019 escherstair 2019-10-02 10:21:56 +02:00
  • c08a78f7c6 ColladaExporter: improve name/id handling Chris Weermann (TGE) 2019-10-02 01:32:53 +02:00
  • 6550b1df61 Merge branch 'master' into gltf_mesh_morph_animations vcebollada 2019-10-01 08:04:46 +01:00
  • 09d80ff478 Merge pull request #2666 from theakman2/issue_2662 Kim Kulling 2019-09-30 23:10:24 +02:00
  • ec74f6603b Merge branch 'master' into issue_2662 Kim Kulling 2019-09-30 22:10:45 +02:00
  • 42ff3f1633 Merge branch 'master' into gltf_mesh_morph_animations vcebollada 2019-09-30 13:38:33 +01:00
  • c480b65291 Merge pull request #2680 from grdowns/vcpkg-instructions Kim Kulling 2019-09-29 14:36:18 +02:00
  • 7a8b7ba88d aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0 Theak 2019-09-29 10:09:53 +01:00
  • 8101bc6a77 Add vcpkg installation instructions grdowns 2019-09-26 17:46:26 -07:00
  • 5018af995b Merge branch 'master' into gltf_mesh_morph_animations vcebollada 2019-09-26 11:33:33 +01:00
  • 2757297b4f Merge branch 'master' into issue_2662 Kim Kulling 2019-09-26 09:55:16 +02:00
  • 0e85872951 Merge pull request #2663 from thomasbiang/fix-multi-uvset-coord Kim Kulling 2019-09-26 08:55:47 +02:00
  • ae3236f481 Support Apple naming conventions - shared library Dániel Molnár 2019-09-24 22:30:00 +02:00
  • 8ca39ade6a Merge branch 'master' into gltf_mesh_morph_animations vcebollada 2019-09-25 16:16:32 +01:00
  • 6e75d7a839 Merge branch 'master' into fix-multi-uvset-coord Kim Kulling 2019-09-25 16:57:24 +02:00
  • a75fc4563a Merge pull request #2669 from theakman2/issue_2668 Kim Kulling 2019-09-25 16:56:52 +02:00
  • e0fee3d87b gltf2.0 importer - Support for mesh morph animations added. Victor Cebollada 2019-09-25 09:57:53 +01:00
  • 12a101124a Merge branch 'master' into issue_2668 Kim Kulling 2019-09-24 19:29:40 +02:00
  • 2d2889f73f Merge pull request #2667 from theakman2/issue_2661 v5.0.0 Kim Kulling 2019-09-24 19:28:59 +02:00
  • b8e53c967f Merge branch 'master' into issue_2668 Alan 2019-09-24 02:21:59 +01:00
  • d3a79d0cc2 Merge branch 'master' into issue_2661 Alan 2019-09-24 02:21:19 +01:00
  • 17f55aa67e Merge branch 'master' into issue_2662 Alan 2019-09-24 02:20:47 +01:00
  • c07793149c Merge pull request #2671 from JenniferBuehler/master Kim Kulling 2019-09-23 17:00:50 +02:00
  • 3b2e0ebfc7 Merge branch 'master' into issue_2661 Kim Kulling 2019-09-23 16:59:28 +02:00
  • aa47a028c8 Fix UV texture coords generation along Z Axis Jennifer Buehler 2019-09-23 11:22:20 +02:00
  • 74ac8676e2 Merge pull request #2670 from assimp/fix_static_code_analysis Kim Kulling 2019-09-22 15:56:37 +02:00
  • ab3c17419e fix warning Kim Kulling 2019-09-22 12:27:44 +02:00
  • 61fa619f92 Fix: Mismatched new/free in gltf2 importer (fixes #2668) Theak 2019-09-22 10:24:30 +01:00
  • 720ac4846b Fix: memory leak in gltf2 importer (fixes #2661) Theak 2019-09-22 10:12:19 +01:00
  • 0e6478c0d4 Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662) Theak 2019-09-22 09:59:58 +01:00
  • 94c488d7ea fix compiler warnings. Kim Kulling 2019-09-22 10:15:44 +02:00
  • ef54a00fc4 Use correct escape sequence for unsigned. Kim Kulling 2019-09-22 09:12:37 +02:00
  • 87004aa70c Merge pull request #2664 from assimp/new_aistringsize Kim Kulling 2019-09-22 11:09:00 +02:00
  • 06eb199704 Merge branch 'master' into new_aistringsize Kim Kulling 2019-09-21 22:31:48 +02:00
  • aeecc17482 Merge pull request #2665 from assimp/move_qt_viewer_to_new_repo Kim Kulling 2019-09-21 22:31:31 +02:00
  • 13586eb073 remove the qt-viewer from the build system. Kim Kulling 2019-09-21 18:02:37 +02:00
  • 69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. Kim Kulling 2019-09-21 16:36:22 +02:00
  • a4092a3234 correct uvset index ywang 2019-09-20 17:53:15 -07:00
  • 83df4f4104 Merge pull request #2658 from escherstair/fix-codacy-issues Kim Kulling 2019-09-19 11:53:58 +02:00
  • d4101bbf06 fix regression escherstair 2019-09-19 08:07:55 +02:00
  • 18bbfdac1a init variable 'base' in initializer list escherstair 2019-09-19 08:01:47 +02:00
  • 4b9cc1a484 Merge branch 'master' into fix-codacy-issues Kim Kulling 2019-09-18 20:32:49 +02:00
  • b6edcb35a8 Merge pull request #2659 from creacore-team/master Kim Kulling 2019-09-18 20:31:54 +02:00
  • dbf47f7769 fix issue #2551 Bruno 2019-09-18 17:54:30 +02:00
  • e3d277faea Merge pull request #2656 from assimp/kimkullig_dev Kim Kulling 2019-09-18 16:40:31 +02:00
  • 9186e107f6 Update .travis.sh Kim Kulling 2019-09-18 14:51:19 +02:00
  • fed7fcf2fb Update utFBXImporterExporter.cpp Kim Kulling 2019-09-18 14:09:48 +02:00
  • 06542c49df Update utFBXImporterExporter.cpp Kim Kulling 2019-09-18 11:50:26 +02:00
  • 1abf6d50fe fixed regression #2 escherstair 2019-09-18 08:31:33 +02:00