summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Create android_master.ymlupstream/kimkulling-patch-androidKim Kulling2020-12-121-0/+23
* Merge pull request #3518 from Biswa96/add-msvc-checkKim Kulling2020-12-1110-19/+49
|\
| * Merge branch 'master' into add-msvc-checkKim Kulling2020-12-1113-149/+229
| |\ | |/ |/|
* | Merge pull request #3521 from huiji12321/masterKim Kulling2020-12-111-3/+9
|\ \
| * \ Merge branch 'master' into masterhuiji123212020-12-101-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #3515 from LoicFr/masterKim Kulling2020-12-091-1/+1
|\ \ \
| * \ \ Merge branch 'master' into masterKim Kulling2020-12-091-1/+4
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into masterKim Kulling2020-12-0811-144/+220
| |\ \ \
| * | | | glTF2Exporter: fix crash when exporting a scene with several meshes per node ...FRICOTEAUX2020-11-301-1/+1
| | | * | Merge branch 'master' into masterKim Kulling2020-12-0910-131/+193
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #3528 from tellypresence/issue-3525_use_option_for_rapidjs...Kim Kulling2020-12-091-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Provide option for rapidjson no-member-iterator definetellypresence2020-12-091-1/+4
|/ / / /
* | | | Merge pull request #3514 from ms-maxvollmer/gltf_fixesKim Kulling2020-12-085-17/+30
|\ \ \ \
| * \ \ \ Merge branch 'master' into gltf_fixesKim Kulling2020-12-071-4/+7
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3516 from assimp/kimkulling-patch-8Kim Kulling2020-12-071-4/+7
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into kimkulling-patch-8Kim Kulling2020-12-074-123/+178
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update Readme.mdKim Kulling2020-12-011-4/+7
| | * | | | Merge branch 'master' into gltf_fixesKim Kulling2020-12-043-109/+152
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3512 from boguscoder/masterKim Kulling2020-12-041-0/+39
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterKim Kulling2020-12-044-123/+144
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafetyKim Kulling2020-12-042-109/+113
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fbxExceptionSafetyKim Kulling2020-12-042-14/+31
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into fbxExceptionSafetyKim Kulling2020-11-277-80/+105
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into fbxExceptionSafetyKim Kulling2020-11-236-45/+112
| |\ \ \ \ \ \ \
| * | | | | | | | UnsignedMalcolm Tyrrell2020-11-191-1/+1
| * | | | | | | | Neater constructionMalcolm Tyrrell2020-11-171-5/+6
| * | | | | | | | First pass at PotentialNodeMalcolm Tyrrell2020-11-172-109/+112
| | | | * | | | | Fix for 3489 | Preserve morph targets when splitting by bone countOleg Bogdanov2020-11-281-0/+39
| | | |/ / / / /
| | | | | * | | Merge branch 'master' into gltf_fixesMax Vollmer (Microsoft Havok)2020-12-041-14/+26
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| | | | | * | | Merge branch 'master' into gltf_fixesMax Vollmer (Microsoft Havok)2020-12-031-0/+5
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Fixed check for base64 char valuesMax Vollmer2020-11-301-2/+2
| | | | | * | | Some improvementsMax Vollmer2020-11-301-4/+5
| | | | | * | | * Improved error messagesMax Vollmer2020-11-305-16/+28
| | | | |/ / / | | | |/| | |
| | | | | * | Additional Compiler Options for mips64elhuiji123212020-12-041-3/+9
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #3505 from Neil-Clifford-FB/scenepreprocessor-memoryleakKim Kulling2020-12-031-14/+26
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update ScenePreprocessor.cppKim Kulling2020-12-031-17/+17
| * | | | | Merge branch 'master' into scenepreprocessor-memoryleakKim Kulling2020-12-034-41/+11
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into scenepreprocessor-memoryleakNeil Clifford2020-11-269-84/+211
| |\ \ \ \ \
| * | | | | | Sceneprecessor potential memory leakNeil Clifford2020-11-191-0/+12
| | |/ / / / | |/| | | |
| | | | | * Check _MSC_VER for MSVC specific pragma directives.Biswapriyo Nath2020-12-0210-19/+49
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #3503 from natanaeljr/masterKim Kulling2020-12-011-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update README.mdKim Kulling2020-12-011-0/+1
| * | | | Merge branch 'master' into masterKim Kulling2020-11-3012-125/+217
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3511 from MalcolmTyrrell/fbxVideoKeysKim Kulling2020-11-273-41/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't need operator< either.Malcolm Tyrrell2020-11-271-5/+0
| * | | | textures_converted keys can just be pointersMalcolm Tyrrell2020-11-263-36/+6
|/ / / /
* | | | Merge pull request #3487 from inhosens/masterKim Kulling2020-11-253-31/+59
|\ \ \ \
| * \ \ \ Merge branch 'master' into masterKim Kulling2020-11-255-10/+54
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3504 from Neil-Clifford-FB/fbxparser-overeadKim Kulling2020-11-251-8/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' into fbxparser-overeadKim Kulling2020-11-246-45/+112
| |\ \ \ \ | |/ / / / |/| | | |