Commit Graph

  • 6ea97a1282 Updated test cases to test import of names RevoluPowered 2019-10-26 17:27:07 +0100
  • 168ae22ad4 Implemented easy armature lookup RevoluPowered 2019-10-26 16:28:51 +0100
  • 120e97e55b
    Merge branch 'master' into assimp_version_2693 Kim Kulling 2019-10-27 13:47:59 +0100
  • 29f7ea0235
    Merge pull request #2698 from Zalewa/mingw-fix-2685 Kim Kulling 2019-10-27 13:47:24 +0100
  • b8321925c3
    Merge branch 'master' into mingw-fix-2685 Kim Kulling 2019-10-27 10:43:00 +0100
  • e63123de75
    Merge pull request #2697 from ffontaine/master Kim Kulling 2019-10-27 10:42:33 +0100
  • 93d87c775d
    Merge branch 'master' into master Kim Kulling 2019-10-27 09:00:47 +0100
  • 27f4e1dd20 Implement armature and bone stack handling RevoluPowered 2019-10-26 14:21:46 +0100
  • 4910587585 Implemented dictionary to reduce code complexity as all other code was basically because this data was not a dict. RevoluPowered 2019-09-19 15:33:56 +0100
  • 8a8bb5d216 Removed pivot compilation as this needs handled properly RevoluPowered 2019-10-02 19:48:05 +0100
  • 3bfd06483e
    Merge pull request #2723 from assimp/kimkulling-patch-1 Kim Kulling 2019-10-25 17:15:09 +0200
  • b5f659c98d Added clang format RevoluPowered 2019-10-02 19:44:58 +0100
  • 5baff40edc Git ignore RevoluPowered 2019-10-02 19:44:30 +0100
  • 2d086fd236 ColladaParser: fix handling of empty XML-elements Raphael Dümig 2019-10-25 15:10:54 +0200
  • 5f58ef82b9 prevent accidental lower casing material names in ReplaceDefaultMaterial Rem 2019-10-25 10:18:27 +0300
  • cbd4e8bc22 Fix inconsistent indentation in previous commit. Paul Arden 2019-10-25 12:19:28 +1100
  • 822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. Paul Arden 2019-10-25 12:17:43 +1100
  • fa8ab3b1e7
    Merge pull request #9 from assimp/master ardenpm 2019-10-25 11:55:13 +1100
  • 7abc551b47
    Merge branch 'master' into kimkulling-patch-1 Kim Kulling 2019-10-24 20:22:32 +0200
  • 41ab019cbf
    Update appveyor.yml Kim Kulling 2019-10-23 22:42:19 +0200
  • bd25cc7c8f
    Merge pull request #2704 from MalcolmTyrrell/fix-gltf-importer-crash Kim Kulling 2019-10-23 22:39:12 +0200
  • 932acf4350
    Merge branch 'master' into fix-gltf-importer-crash Kim Kulling 2019-10-23 20:14:38 +0200
  • 31e885a47a
    Update appveyor.yml Kim Kulling 2019-10-22 20:24:23 +0200
  • 85bde1122d
    Merge pull request #2715 from migenius/migenius-fix-vs2013-build Kim Kulling 2019-10-22 20:23:22 +0200
  • df3e22d9ba
    Merge branch 'master' into migenius-fix-vs2013-build Kim Kulling 2019-10-21 20:57:29 +0200
  • 9bc2648615
    Merge branch 'master' into fix-gltf-importer-crash Malcolm Tyrrell 2019-10-21 15:29:18 +0100
  • 794c976764
    Update o3dgcVector.h Kim Kulling 2019-10-20 20:33:20 +0200
  • 3a484d879f
    Merge pull request #2722 from jherico/patch-1 Kim Kulling 2019-10-20 15:15:08 +0200
  • effdb74a87
    Merge branch 'master' into patch-1 Kim Kulling 2019-10-19 20:54:17 +0200
  • 1dd532d61b
    Merge pull request #2690 from TGEnigma/fix_dae_export Kim Kulling 2019-10-19 20:52:57 +0200
  • c350d4f487
    Update ColladaExporter.cpp Kim Kulling 2019-10-19 12:08:57 +0200
  • fa1dc3b8f1
    Fix CMake import Bradley Austin Davis 2019-10-18 13:02:32 -0700
  • d8979cbc1f
    Merge pull request #2 from assimp/master Tomas Mariancik 2019-10-18 14:30:34 +0200
  • 9aa9238e7e Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714. Paul Arden 2019-10-18 14:40:41 +1100
  • 075d05e604
    Merge branch 'master' into fix_dae_export TGE 2019-10-17 23:52:44 +0200
  • c97fdc85cb
    Merge branch 'master' into fix_static_code_analysis Kim Kulling 2019-10-17 10:56:45 +0200
  • 3fab8bef9d next fixes of static code analysis. Kim Kulling 2019-10-17 10:56:09 +0200
  • 51fc0f4ec4
    Merge branch 'master' into assimp_version_2693 RichardTea 2019-10-16 10:00:50 +0100
  • e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. Paul Arden 2019-10-16 19:06:57 +1100
  • 6be2249cb9 Merge branch 'fix_static_code_analysis' of https://github.com/assimp/assimp into fix_static_code_analysis Kim Kulling 2019-10-16 09:42:51 +0200
  • 8a4c35598e
    Merge pull request #8 from assimp/master ardenpm 2019-10-16 15:22:33 +1100
  • ce495cf197 WIP refactoring changes from stash RevoluPowered 2019-10-15 13:17:29 +0100
  • 17eb292d73 Tests: Fix signed/unsigned warnings RichardTea 2019-10-14 14:49:57 +0100
  • 168c7e2f7b Added WIP rest matrix RevoluPowered 2019-10-14 12:53:16 +0100
  • f4bd11279f Update Collada ZAE tests to include encoded URIs RichardTea 2019-10-14 12:25:42 +0100
  • 198bc428fa Fix some warnings in Collada import RichardTea 2019-10-14 12:15:02 +0100
  • d371a113fa /DEBUG:FULL is not a compiler flag RichardTea 2019-10-14 12:10:47 +0100
  • 6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() RichardTea 2019-10-14 11:27:34 +0100
  • 5e84889724 Merge branch 'master' into collada_zae_textures_2710 RichardTea 2019-10-14 10:56:53 +0100
  • d3ddf8de60
    Merge branch 'master' into mingw-fix-2685 Kim Kulling 2019-10-12 11:24:33 +0200
  • 799fd74714
    Merge pull request #2708 from assimp/cleanup_headers Kim Kulling 2019-10-11 20:34:54 +0200
  • ce5c71d2e7 Collada ZAE import must convert manifest and image paths RichardTea 2019-10-11 18:57:38 +0100
  • 059ee0e091 Update assimp legal and version RichardTea 2019-10-11 16:28:14 +0100
  • 3c3549a07a
    Merge branch 'master' into cleanup_headers Kim Kulling 2019-10-11 14:25:00 +0200
  • 14f8877a2c
    Merge pull request #2677 from mdinim/master Kim Kulling 2019-10-11 13:44:43 +0200
  • 3f38011e86 Fix filter for vs for public headers. kimkulling 2019-10-11 13:41:13 +0200
  • 33af183bb8 Cleanup the public headers. kimkulling 2019-10-11 13:27:36 +0200
  • 789a2bdd36 Move stuff into def.h kkulling 2019-10-11 09:47:31 +0200
  • 111d8a2491 Post godotcon commit for laptop RevoluPowered 2019-10-10 21:58:40 +0100
  • 77c771d05a jt:intial commit kimkulling 2019-10-10 16:26:52 +0200
  • f03f744dfc
    Merge branch 'master' into master Kim Kulling 2019-10-10 15:59:12 +0200
  • 515daad19a
    Silence a winuwp depecation warning for rapidjson (#4) Christian Venegas 2019-10-09 15:19:04 -0700
  • 3a6648734c
    Merge pull request #2699 from feniksa/master Kim Kulling 2019-10-09 14:54:07 +0200
  • 2102f7e79c
    Merge branch 'master' into master Kim Kulling 2019-10-09 11:51:16 +0200
  • 927276f1e8
    Merge pull request #2706 from assimp/enginmanap-issue_2693 Kim Kulling 2019-10-09 11:50:07 +0200
  • 1c3f734cd6
    Merge branch 'master' into issue_2693 Kim Kulling 2019-10-08 20:25:58 +0200
  • 77e9a31755 Fixed stack being used up when mesh swapped & Fixed bone ID RevoluPowered 2019-10-08 19:05:20 +0100
  • 9280a1d168 Remove fix to test for buffer overruns.. Malcolm Tyrrell 2019-10-08 18:05:08 +0100
  • 3b3e34c36a Fix one byte memory leak. Malcolm Tyrrell 2019-10-08 15:15:16 +0100
  • f8bdb77de1 Remove unneeded file Malcolm Tyrrell 2019-10-08 14:27:00 +0100
  • 4cde72b4e6 Add unit tests. Malcolm Tyrrell 2019-10-08 13:05:05 +0100
  • 5f8f5c3292 Organize test models better. Malcolm Tyrrell 2019-10-08 12:51:31 +0100
  • 5a1276032e Add bound checks. Malcolm Tyrrell 2019-10-08 12:51:08 +0100
  • ce4cb39302 Make example minimal. Malcolm Tyrrell 2019-10-08 11:46:07 +0100
  • 8498310fa0 A gltf v2 which exercises all the options. Malcolm Tyrrell 2019-10-08 11:35:03 +0100
  • 77ebc53f1f Offset nodes. Malcolm Tyrrell 2019-10-08 10:44:17 +0100
  • 1e7d1ffbc2 Add non-indexed unit test. Malcolm Tyrrell 2019-10-08 10:34:08 +0100
  • bf85079cec Armature mapping to bone data. RevoluPowered 2019-10-07 21:30:52 +0100
  • 63a047119f Findassimp.cmake: add hint for include path's for Linux Maksym Sditanov 2019-10-07 22:07:51 +0300
  • ed5d38b975
    Merge branch 'master' into master Kim Kulling 2019-10-07 20:49:47 +0200
  • b8006cb4c9 Findassimp.cmake: add hint for lib search path for Linux Maksym Sditanov 2019-10-07 21:41:38 +0300
  • 10993cf236 Slight revert we need duplicates RevoluPowered 2019-10-07 18:50:57 +0100
  • a0de8dba18
    Merge branch 'master' into fix_static_code_analysis Kim Kulling 2019-10-07 18:58:43 +0200
  • ceebcfe902 WIP pre-existing weight data... need to append weight information to bone data. RevoluPowered 2019-10-07 15:57:34 +0100
  • dcab8892f4 Improved debug output RevoluPowered 2019-10-07 15:52:25 +0100
  • fab22d5e64 Added global bone mape to FBXConverter.h and refactored bone list back in for local cluster bone data. RevoluPowered 2019-10-07 15:44:39 +0100
  • 88e5658b8b Bone deform map added for deformer names RevoluPowered 2019-10-07 15:23:35 +0100
  • 165b36c1fc
    Merge pull request #2692 from escherstair/add_VS2013_VS2019 Kim Kulling 2019-10-07 15:09:12 +0200
  • c63f5b2f9e
    removed unused lines escherstair 2019-10-07 11:38:45 +0200
  • 128602f29b
    fixed fatal error escherstair 2019-10-07 10:12:40 +0200
  • 97e060c428
    added CMAKE_GENERATOR_PLATFORM escherstair 2019-10-07 09:34:02 +0200
  • ecd413c86c
    Update utVersion.cpp Kim Kulling 2019-10-06 20:19:59 +0200
  • 6ac8279977 assimpTargets.cmake: define add_library() with lib type directly Robikz 2019-10-06 18:46:51 +0200
  • 0761530e17 Set proper sharedLibraryName for MinGW in installed assimpTargets-*.cmake Robikz 2019-10-06 18:46:47 +0200
  • 81d125a2cc dllexport ASSIMP_API in all Windows compilers, not just MSVC Robikz 2019-10-06 18:46:35 +0200
  • 32781a566d Fix FBXConverter: use proper 64-bit constant Fabrice Fontaine 2019-10-06 15:42:11 +0200
  • c443092c44
    Merge branch 'master' into add_VS2013_VS2019 Kim Kulling 2019-10-06 11:12:15 +0200
  • 78cfec41ec
    Merge branch 'master' into issue_2693 Kim Kulling 2019-10-06 11:11:22 +0200
  • eda113ddcb
    Merge branch 'master' into fix_static_code_analysis Kim Kulling 2019-10-06 09:08:53 +0200
  • d2476e9cda
    Merge pull request #2675 from vcebollada/gltf_mesh_morph_animations Kim Kulling 2019-10-06 09:08:24 +0200