Commit Graph

  • b6b3b39bb3
    Merge pull request #3096 from assimp/kimkulling-patch-3 Kim Kulling 2020-03-29 18:36:26 +0200
  • 097f19eca8 Small changes in CMakeLists.txt Marc-Antoine Lortie 2020-03-29 12:06:24 -0400
  • 5bc2e84c90
    Add mac Kim Kulling 2020-03-29 17:55:28 +0200
  • d51b89f3ce
    trigger build Kim Kulling 2020-03-29 13:44:14 +0200
  • b1165cff28
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-29 12:07:20 +0200
  • 222b145307
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-03-29 12:54:07 +0300
  • 4796ad3d5e
    Merge pull request #3086 from napina/fbx_rotation_fix Kim Kulling 2020-03-29 10:55:55 +0200
  • 9b83d74830 apply code-conventions to unrealloader Kim Kulling 2020-03-28 09:48:55 +0100
  • 27e1a20efe
    Update 3DSConverter.cpp Kim Kulling 2020-03-27 20:46:32 +0100
  • 3a206a424d
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-27 18:25:13 +0100
  • e543a58dfb
    Update m3d.h Kim Kulling 2020-03-27 18:23:22 +0100
  • 2cfdbe2d50
    Update m3d.h Kim Kulling 2020-03-27 16:27:07 +0100
  • 7a01061c3e
    Update m3d.h Kim Kulling 2020-03-27 15:39:49 +0100
  • 60750161d5
    Update m3d.h Kim Kulling 2020-03-27 15:28:32 +0100
  • 855452831c
    Merge branch 'master' into fbx_rotation_fix Ville Ruusutie 2020-03-27 14:36:00 +0200
  • f9a7d2abf1 Added C API tests. Marc-Antoine Lortie 2020-03-27 07:59:10 -0400
  • 32c59643f2
    Update m3d.h Kim Kulling 2020-03-27 11:38:38 +0100
  • 80323b57bc
    Update UnrealLoader.cpp Kim Kulling 2020-03-27 11:30:40 +0100
  • 7a2bc5f8f3
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-03-27 07:12:25 +0200
  • ebfe5a7ebd
    Merge branch 'master' into reverted Ricardo Reis 2020-03-26 20:41:27 -0300
  • bd5b7ecab9
    Merge pull request #3089 from malortie/add-missing-c-api-functions Kim Kulling 2020-03-26 20:38:22 +0100
  • 69176ad425
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-03-26 21:28:47 +0200
  • 7f521b4eb4
    Merge branch 'master' into fbx_rotation_fix Ville Ruusutie 2020-03-26 21:28:03 +0200
  • 609632c6a5 Added missing functionalities to C API. Marc-Antoine Lortie 2020-03-26 13:08:40 -0400
  • 73b4719b38 Added missing files rickomax 2020-03-26 10:29:49 -0300
  • f08bc8d274 Fixes rickomax 2020-03-26 09:50:20 -0300
  • 2d65d8cbe1
    Merge branch 'master' into reverted Ricardo Reis 2020-03-26 09:14:12 -0300
  • 6372432003
    Update IPHONEOS_ARM64E_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:26:06 -0300
  • 5518ab1096
    Update IPHONEOS_X86_64_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:25:18 -0300
  • 4237df3796
    Update IPHONEOS_I386_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:25:02 -0300
  • d23a42403f
    Update IPHONEOS_ARMV7_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:24:45 -0300
  • 40537964f8
    Update IPHONEOS_ARMV7S_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:24:22 -0300
  • 8b907afe66
    Update IPHONEOS_ARMV6_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:24:01 -0300
  • bbdbc7414c
    Update IPHONEOS_ARM64_TOOLCHAIN.cmake Ricardo Reis 2020-03-26 08:23:41 -0300
  • 1ab7d380b1
    Update buildall-minsizerel.yml Ricardo Reis 2020-03-26 08:02:23 -0300
  • 96c7c567e6
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-26 11:56:45 +0100
  • e7d9667496 Update CMakeLists.txt rickomax 2020-03-26 07:48:46 -0300
  • 70e6844dfb Update CMakeLists.txt rickomax 2020-03-26 07:40:41 -0300
  • 84f1adb6d3 Update ObjFileMtlImporter.cpp rickomax 2020-03-26 07:32:16 -0300
  • 9238582abd Converted from uint16_t to uint32_t rickomax 2020-03-26 07:26:40 -0300
  • 3c9751ce0c
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-03-26 10:16:58 +0000
  • da8b174ecb
    Merge pull request #3069 from ms-maxvollmer/GLTF2_guarantee_rootnode_fix Kim Kulling 2020-03-26 11:12:33 +0100
  • c34ac4b19e Update PmdHelper.cpp rickomax 2020-03-25 20:39:44 -0300
  • 4f45bd584d Update PmdHelper.cpp rickomax 2020-03-25 20:24:19 -0300
  • 524897d843 Update method rickomax 2020-03-25 19:51:22 -0300
  • 0750dc38c6 Update CMakeLists.txt rickomax 2020-03-25 18:08:18 -0300
  • f72d78410d Removed PmdStringHelper rickomax 2020-03-25 18:02:25 -0300
  • 38d9c7125a Update MMDVmdParser.h rickomax 2020-03-25 17:03:34 -0300
  • 9378481d7d Update FBXMaterial.cpp rickomax 2020-03-25 15:40:53 -0300
  • f9a2bf2425 Update FBXConverter.cpp rickomax 2020-03-25 15:28:24 -0300
  • a973c73409 Sync with master rickomax 2020-03-25 14:57:06 -0300
  • ccd13436da fix memory leak during export kimkulling 2020-03-25 16:37:43 +0100
  • 15e70b1c65 Merge branch 'master' of https://github.com/rickomax/assimp rickomax 2020-03-25 09:48:24 -0300
  • 13e76b7d62 Reset rickomax 2020-03-25 09:48:17 -0300
  • 5d34c25ea9 Merge branch 'master' of https://github.com/rickomax/assimp rickomax 2020-03-25 09:46:39 -0300
  • 4dbcacbde6 Reverted rickomax 2020-03-25 09:46:34 -0300
  • 14b8d1242b Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code. napina 2020-03-25 08:20:31 +0200
  • b962af93fc Merge branch 'master' of https://github.com/assimp/assimp napina 2020-03-24 21:35:22 +0200
  • ec17aff6d6
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-03-24 11:56:44 +0000
  • ef20cdc430
    Merge branch 'master' into GLTF2_guarantee_rootnode_fix Max Vollmer (Microsoft Havok) 2020-03-24 11:56:42 +0000
  • 2820edee54
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-03-24 11:56:38 +0000
  • fb32072391
    Merge branch 'master' into cmake_targets_determine_lib_path Kim Kulling 2020-03-24 11:56:17 +0100
  • 16725cc3f6
    Merge pull request #3075 from aimoonchen/fix_FBX_no_preservePivots_bug Kim Kulling 2020-03-24 11:55:44 +0100
  • 891b1d4b3f
    Merge branch 'master' into fix_FBX_no_preservePivots_bug simon chen 2020-03-24 14:38:23 +0800
  • da04a8e39a
    Merge pull request #3083 from asmaloney/cmake-submodule Kim Kulling 2020-03-23 19:56:09 +0100
  • 046f50880f {cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule Andy Maloney 2020-03-23 12:35:32 -0400
  • c1001c0e07 Merge branch 'master' of https://github.com/assimp/assimp kkulling 2020-03-23 11:46:29 +0100
  • f227c66273 Fix dynamic loading path for OSX Nick Overdijk 2020-03-23 09:59:16 +0100
  • bb4bcb442a Merge branch 'master' of https://github.com/assimp/assimp napina 2020-03-23 10:35:06 +0200
  • 2006eeed85
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-03-23 08:07:25 +0000
  • 94da6d61a4
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-03-23 08:03:29 +0000
  • 6f8d96b57e
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-23 09:00:41 +0100
  • 973e38ad97
    Merge branch 'master' into GLTF2_guarantee_rootnode_fix Max Vollmer (Microsoft Havok) 2020-03-23 07:57:38 +0000
  • 2e65b11e96
    Merge branch 'master' into sample-simpleopengl-minor-improvements Kim Kulling 2020-03-22 16:56:59 +0100
  • 7e5a0acc48
    Merge pull request #3012 from assimp/enable_vs_warning_all Kim Kulling 2020-03-22 16:56:11 +0100
  • f0243cc7f3 Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing. napina 2020-03-22 15:58:12 +0200
  • c0ae9b6040 fix invalid check Kim Kulling 2020-03-22 14:21:24 +0100
  • 14860f3822 fix warning. Kim Kulling 2020-03-22 13:34:27 +0100
  • 68a9fa2df3 reformat unittests. Kim Kulling 2020-03-22 12:13:09 +0100
  • d5d30c898b Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying. napina 2020-03-22 12:47:42 +0200
  • edc73552cd fix another warning: missing override. Kim Kulling 2020-03-22 09:17:44 +0100
  • 378c87ccf4 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all Kim Kulling 2020-03-21 20:10:44 +0100
  • 14aea3f1a4 fix another unittest warning. Kim Kulling 2020-03-21 20:10:40 +0100
  • 951ec9e0d9
    Merge branch 'master' into master Adrian Iusca 2020-03-21 21:06:50 +0200
  • 4283e61189 fix clang-compiler warning: wrong move constructor. Kim Kulling 2020-03-21 18:25:49 +0100
  • 2d0f8093d8 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all Kim Kulling 2020-03-21 18:03:53 +0100
  • 089ab0693a fix static-code-analysis check. Kim Kulling 2020-03-21 18:03:35 +0100
  • 62415bca40
    Merge branch 'master' into enable_vs_warning_all Kim Kulling 2020-03-21 17:37:54 +0100
  • 0c3933ca7c
    Merge pull request #3078 from assimp/kimkulling-githubactions Kim Kulling 2020-03-21 17:37:21 +0100
  • b4bc91c13b
    Update Readme.md Kim Kulling 2020-03-21 16:22:18 +0100
  • 4b1aaff0dc
    Create ccpp.yml Kim Kulling 2020-03-21 10:59:32 +0100
  • 7d624e7f60 obj: add missing init. Kim Kulling 2020-03-21 09:00:29 +0100
  • 7fda14078b
    Merge branch 'master' into enable_vs_warning_all Kim Kulling 2020-03-21 08:57:15 +0100
  • 9f7d9becb2 fix the linux build. Kim Kulling 2020-03-21 08:56:49 +0100
  • 1529f9518f
    Make file formatting comply with POSIX and Unix standards Aaron Franke 2020-03-21 02:34:12 -0400
  • a6152b0eec Always set IMPORTED_CONFIGURATIONS, always add to IMPORT_CHECK_TARGETS Nick Overdijk 2020-03-20 15:22:05 +0100
  • b40769c395 try to fix linux build.2 kkulling 2020-03-20 13:18:49 +0100
  • 7c3fd351d3 fix no preservePivots bug chenmou.cm 2020-03-20 17:19:27 +0800
  • dd58568d60 fix vs2013 warnings in unittests kimkulling 2020-03-20 10:04:44 +0100
  • ac3f08a4d8 fix 3rdparty warnings. kimkulling 2020-03-20 09:49:36 +0100