Commit Graph

12528 Commits (f69e55058d044aca5f290aa6f29b6e8736c80816)

Author SHA1 Message Date
Kim Kulling 85b470a3ee
Merge branch 'master' into clang-cl-15.0.1-support 2023-03-29 21:20:25 +02:00
Kim Kulling 6fa2f86d6b
Merge pull request #5032 from assimp/kimkulling-patch-1
Update Readme.md
2023-03-29 21:19:42 +02:00
Kim Kulling 4daf8c36bc
Merge branch 'master' into kimkulling-patch-1 2023-03-29 20:41:54 +02:00
aniongithub 4438b3ecc9 Fix Issue #4486 using the fix described by @jianliang79 2023-03-29 18:36:18 +00:00
Kim Kulling 5d6ca9808d
Merge pull request #5035 from assimp/kimkulling/update-readme
Update Readme.md
2023-03-28 17:04:57 +02:00
Kim Kulling 55fa3d4251
Update Readme.md 2023-03-28 15:19:33 +02:00
Kim Kulling 3801d7e78f
Merge pull request #5034 from assimp/kimkulling/update-readme
Update Readme.md
2023-03-28 14:57:03 +02:00
Kim Kulling f4e9930e50
Update Readme.md 2023-03-28 13:45:09 +02:00
Adam Beili 8ac0af5c58
. 2023-03-26 17:13:16 +02:00
Adam Beili b6ecba9114
fix 2023-03-26 17:03:46 +02:00
Adam Beili 83053f3d56
Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec 2023-03-26 16:55:38 +02:00
Adam Beili fa00571049
fixed compilation bug 2023-03-26 14:52:44 +02:00
Kim Kulling d8201bdb6f
Update Readme.md 2023-03-25 16:00:29 +01:00
Adam Beili c9177b7811
Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +01:00
Turo Lamminen 6832aa227a Add more DXF files to unit tests 2023-03-24 11:32:06 +02:00
Turo Lamminen bed2cf1a23 Add more BVH files to unit tests 2023-03-24 11:32:06 +02:00
Turo Lamminen e8d4a11af5 Add more 3DS files to unit tests 2023-03-24 11:32:06 +02:00
Turo Lamminen 0e657b575b Add more 3D files to unit tests 2023-03-24 11:32:06 +02:00
Kim Kulling e02a1ff577
Merge pull request #5017 from tellypresence/provide-utf8-IRR-files
Add UTF-8 versions of UTF-16LE IRR/IRRMesh files
2023-03-24 00:10:35 +01:00
Kim Kulling e6c63cbee2
Merge branch 'master' into provide-utf8-IRR-files 2023-03-23 22:53:34 +01:00
Kim Kulling 03aee802b2
Merge pull request #5030 from assimp/kimkulling/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2023-03-23 17:59:10 +01:00
inhosens 7095c4f52f
Merge branch 'master' into master 2023-03-23 07:30:49 +01:00
Steve M fc1a88deb4
Merge branch 'master' into provide-utf8-IRR-files 2023-03-22 14:49:08 -07:00
Kim Kulling f43281e89b
Merge branch 'master' into kimkulling/add-code-of-conduct-1 2023-03-22 21:48:34 +01:00
Kim Kulling 7437f20d0a
Merge pull request #5026 from turol/amf-tests
Add more AMF unit tests
2023-03-22 20:06:22 +01:00
Kim Kulling c32f4b71b7
Create CODE_OF_CONDUCT.md 2023-03-22 20:00:09 +01:00
Turo Lamminen 5ddd18d1c7 Add more AMF unit tests 2023-03-22 12:06:30 +02:00
inhosens 7cc0c06fdb
Merge branch 'assimp:master' into master 2023-03-22 08:30:52 +01:00
Steve M 9552769f82
Merge branch 'master' into provide-utf8-IRR-files 2023-03-21 13:35:01 -07:00
Kim Kulling c546a4a73a
Merge pull request #4985 from MakerOfWyverns/master
Two bug fixes in Python port.
2023-03-21 20:43:40 +01:00
Kim Kulling 4e645a0412
Merge branch 'master' into master 2023-03-21 19:42:43 +01:00
Kim Kulling cf3c9d515a
Merge pull request #5019 from tellypresence/revert-possibly-corrupted-ply-file
Revert 3D model corrupted by a8a1ca9
2023-03-21 19:40:42 +01:00
Kim Kulling d8e2fc30a0
Merge branch 'master' into revert-possibly-corrupted-ply-file 2023-03-21 17:36:10 +01:00
Steve M d902c2293d
Merge branch 'master' into provide-utf8-IRR-files 2023-03-21 09:27:44 -07:00
Kim Kulling 6360c90ac0
Merge pull request #4981 from Jackie9527/1-1922
bugfix fails to check if point in triangle.
2023-03-21 13:19:31 +01:00
Kim Kulling f81bb90f89
Merge branch 'master' into 1-1922 2023-03-21 12:58:11 +01:00
Turo Lamminen 65440f17a1 Add more ASE model unit tests 2023-03-21 12:09:27 +02:00
Turo Lamminen ea3cc37890 Check node parents in ValidateDataStructure 2023-03-21 11:36:49 +02:00
Turo Lamminen 48d89622ee Use ASSERT_NE to check that scene has loaded
EXPECT_NE tries to continue so it ended up dereferencing
null pointers and crashed.
2023-03-21 11:36:49 +02:00
Inho Lee cdfdd75a66 FBXConverter : import FbxCamera correctly
FbxCamera's default value is correct but its transformed
values are described in each NodeProperties.
2023-03-21 10:35:24 +01:00
Kim Kulling 6da160f14d
Merge pull request #4980 from Jackie9527/1-3193
bugfix remove duplicated data.
2023-03-20 23:58:16 +01:00
Kim Kulling e7e4e3100f
Merge branch 'master' into 1-3193 2023-03-20 14:01:35 +01:00
Turo Lamminen 3a69e353f3 Make Blender MVert no field optional 2023-03-20 12:00:20 +02:00
Steve M 92409a821d Provide dwarf textures for COB model
Duped from B3D and X dwarf folders
2023-03-18 22:44:20 -07:00
Steve M e2063b3ba6 Revert to commit 13 May 2014 (08bacc7)
Changes were introduced to the binary portion of this file at some point
2023-03-17 22:42:17 -07:00
Steve M 95616cf5b5 Add UTF-8 versions of UTF-16LE files
Also duplicate missing textures for local model access
2023-03-17 22:13:40 -07:00
Kim Kulling e394bda707
Merge branch 'master' into 1-1922 2023-03-17 09:37:37 +01:00
Kim Kulling 5a4f7c0a37
Merge pull request #5007 from malortie/fix_hl1_mdl_importer_bone_hierarchy
Fix Half-Life 1 MDL importer bone hierarchy.
2023-03-16 14:20:49 +01:00
Kim Kulling 435181f5f5
Merge branch 'master' into fix_hl1_mdl_importer_bone_hierarchy 2023-03-15 14:38:09 +01:00
Kim Kulling 88f3b950c7
Merge pull request #5011 from assimp/kimkulling/remove-deprecated-badge
Remove alarm badge
2023-03-15 14:35:50 +01:00