Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create android_master.ymlupstream/kimkulling-patch-android | Kim Kulling | 2020-12-12 | 1 | -0/+23 |
* | Merge pull request #3518 from Biswa96/add-msvc-check | Kim Kulling | 2020-12-11 | 10 | -19/+49 |
|\ | |||||
| * | Merge branch 'master' into add-msvc-check | Kim Kulling | 2020-12-11 | 13 | -149/+229 |
| |\ | |/ |/| | |||||
* | | Merge pull request #3521 from huiji12321/master | Kim Kulling | 2020-12-11 | 1 | -3/+9 |
|\ \ | |||||
| * \ | Merge branch 'master' into master | huiji12321 | 2020-12-10 | 1 | -1/+1 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #3515 from LoicFr/master | Kim Kulling | 2020-12-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into master | Kim Kulling | 2020-12-09 | 1 | -1/+4 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master' into master | Kim Kulling | 2020-12-08 | 11 | -144/+220 |
| |\ \ \ | |||||
| * | | | | glTF2Exporter: fix crash when exporting a scene with several meshes per node ... | FRICOTEAUX | 2020-11-30 | 1 | -1/+1 |
| | | * | | Merge branch 'master' into master | Kim Kulling | 2020-12-09 | 10 | -131/+193 |
| | | |\ \ | |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #3528 from tellypresence/issue-3525_use_option_for_rapidjs... | Kim Kulling | 2020-12-09 | 1 | -1/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Provide option for rapidjson no-member-iterator define | tellypresence | 2020-12-09 | 1 | -1/+4 |
|/ / / / | |||||
* | | | | Merge pull request #3514 from ms-maxvollmer/gltf_fixes | Kim Kulling | 2020-12-08 | 5 | -17/+30 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into gltf_fixes | Kim Kulling | 2020-12-07 | 1 | -4/+7 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3516 from assimp/kimkulling-patch-8 | Kim Kulling | 2020-12-07 | 1 | -4/+7 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into kimkulling-patch-8 | Kim Kulling | 2020-12-07 | 4 | -123/+178 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update Readme.md | Kim Kulling | 2020-12-01 | 1 | -4/+7 |
| | * | | | | Merge branch 'master' into gltf_fixes | Kim Kulling | 2020-12-04 | 3 | -109/+152 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3512 from boguscoder/master | Kim Kulling | 2020-12-04 | 1 | -0/+39 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into master | Kim Kulling | 2020-12-04 | 4 | -123/+144 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafety | Kim Kulling | 2020-12-04 | 2 | -109/+113 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into fbxExceptionSafety | Kim Kulling | 2020-12-04 | 2 | -14/+31 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into fbxExceptionSafety | Kim Kulling | 2020-11-27 | 7 | -80/+105 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into fbxExceptionSafety | Kim Kulling | 2020-11-23 | 6 | -45/+112 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Unsigned | Malcolm Tyrrell | 2020-11-19 | 1 | -1/+1 |
| * | | | | | | | | Neater construction | Malcolm Tyrrell | 2020-11-17 | 1 | -5/+6 |
| * | | | | | | | | First pass at PotentialNode | Malcolm Tyrrell | 2020-11-17 | 2 | -109/+112 |
| | | | * | | | | | Fix for 3489 | Preserve morph targets when splitting by bone count | Oleg Bogdanov | 2020-11-28 | 1 | -0/+39 |
| | | |/ / / / / | |||||
| | | | | * | | | Merge branch 'master' into gltf_fixes | Max Vollmer (Microsoft Havok) | 2020-12-04 | 1 | -14/+26 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| | | | | * | | | Merge branch 'master' into gltf_fixes | Max Vollmer (Microsoft Havok) | 2020-12-03 | 1 | -0/+5 |
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | Fixed check for base64 char values | Max Vollmer | 2020-11-30 | 1 | -2/+2 |
| | | | | * | | | Some improvements | Max Vollmer | 2020-11-30 | 1 | -4/+5 |
| | | | | * | | | * Improved error messages | Max Vollmer | 2020-11-30 | 5 | -16/+28 |
| | | | |/ / / | | | |/| | | | |||||
| | | | | * | | Additional Compiler Options for mips64el | huiji12321 | 2020-12-04 | 1 | -3/+9 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #3505 from Neil-Clifford-FB/scenepreprocessor-memoryleak | Kim Kulling | 2020-12-03 | 1 | -14/+26 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Update ScenePreprocessor.cpp | Kim Kulling | 2020-12-03 | 1 | -17/+17 |
| * | | | | | Merge branch 'master' into scenepreprocessor-memoryleak | Kim Kulling | 2020-12-03 | 4 | -41/+11 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'master' into scenepreprocessor-memoryleak | Neil Clifford | 2020-11-26 | 9 | -84/+211 |
| |\ \ \ \ \ | |||||
| * | | | | | | Sceneprecessor potential memory leak | Neil Clifford | 2020-11-19 | 1 | -0/+12 |
| | |/ / / / | |/| | | | | |||||
| | | | | * | Check _MSC_VER for MSVC specific pragma directives. | Biswapriyo Nath | 2020-12-02 | 10 | -19/+49 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #3503 from natanaeljr/master | Kim Kulling | 2020-12-01 | 1 | -0/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Update README.md | Kim Kulling | 2020-12-01 | 1 | -0/+1 |
| * | | | | Merge branch 'master' into master | Kim Kulling | 2020-11-30 | 12 | -125/+217 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3511 from MalcolmTyrrell/fbxVideoKeys | Kim Kulling | 2020-11-27 | 3 | -41/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Don't need operator< either. | Malcolm Tyrrell | 2020-11-27 | 1 | -5/+0 |
| * | | | | textures_converted keys can just be pointers | Malcolm Tyrrell | 2020-11-26 | 3 | -36/+6 |
|/ / / / | |||||
* | | | | Merge pull request #3487 from inhosens/master | Kim Kulling | 2020-11-25 | 3 | -31/+59 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into master | Kim Kulling | 2020-11-25 | 5 | -10/+54 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3504 from Neil-Clifford-FB/fbxparser-overead | Kim Kulling | 2020-11-25 | 1 | -8/+40 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' into fbxparser-overead | Kim Kulling | 2020-11-24 | 6 | -45/+112 |
| |\ \ \ \ | |/ / / / |/| | | | |