Kim Kulling
|
d6885d4025
|
Merge branch 'master' into msvc-clang-nested-anon-types
|
2023-04-03 19:59:59 +02:00 |
Kim Kulling
|
19ff57a6c3
|
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr
|
2023-04-03 11:28:10 +02:00 |
Kim Kulling
|
df21b6799f
|
Merge pull request #5053 from aniongithub/fix-loadfbxasserterror
Fix Issue #4486 using the fix described by @jianliang79
|
2023-04-03 09:14:31 +02:00 |
Ani
|
ae121bfbb0
|
Merge branch 'master' into fix-loadfbxasserterror
|
2023-04-02 22:13:33 -07:00 |
Steve M
|
70aceb203a
|
Merge branch 'master' into create-local-textures
|
2023-04-02 19:31:57 -07:00 |
liedtkeInTUM
|
97e31a895e
|
Merge branch 'master' into fix_getenv_uwp
|
2023-04-01 23:38:48 +02:00 |
Kim Kulling
|
acdb6684ba
|
Merge pull request #5052 from Jackie9527/msvc-clang-shadow-field-in-constructor
Remove unused -Wno-shadow-field-in-constructor.
|
2023-04-01 20:45:43 +02:00 |
Steve M
|
9c5ab67b64
|
Replace provisional image with original historical image
|
2023-04-01 09:20:36 -07:00 |
Jackie9527
|
dacaebc078
|
Remove unused -Wno-shadow-field-in-constructor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 23:49:22 +08:00 |
Steve M
|
6d668382ec
|
Fix model broken in commit a8a1ca9
Restored broken binary from 4bbc033 (5 Mar 2009)
|
2023-03-31 23:20:24 -07:00 |
Steve M
|
e1678f11e6
|
Replace relative paths with local assets/textures
Relative paths can easily contain typos, lower/upper case errors, and in general are brittle
|
2023-03-31 22:17:50 -07:00 |
Jackie9527
|
20b2f857c5
|
Remove -Wno-unreachable-code
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 13:07:30 +08:00 |
Jackie9527
|
4d2512dcae
|
Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 13:03:02 +08:00 |
Jackie9527
|
04066ece8e
|
Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 13:02:04 +08:00 |
Jackie9527
|
1dcb5da1cd
|
Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 13:01:22 +08:00 |
Jackie9527
|
94067994cc
|
Fix warning related to format-non-iso.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 12:29:42 +08:00 |
Jackie9527
|
6b54761310
|
Fix warning related to nested-anon-types.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 10:30:10 +08:00 |
Sven Liedtke
|
5cf9d3abf7
|
std::getenv is not supported using uwp
|
2023-04-01 01:02:21 +02:00 |
Kim Kulling
|
7c64b6c599
|
Merge pull request #4993 from Jackie9527/clang-cl-15.0.1-support
Add build options to fix issues with clang 15.
|
2023-03-31 18:28:12 +02:00 |
Kim Kulling
|
203e1468df
|
Merge branch 'master' into clang-cl-15.0.1-support
|
2023-03-30 22:03:30 +02:00 |
Kim Kulling
|
9c17c8c39a
|
Merge pull request #5037 from liedtkeInTUM/fix_crypt_link_issue_uwp
Fix link issue in UWP builds without functional replacement
|
2023-03-30 21:59:22 +02:00 |
liedtkeInTUM
|
d032c3162a
|
Merge branch 'master' into fix_crypt_link_issue_uwp
|
2023-03-30 09:37:28 +02:00 |
Sven Liedtke
|
6d65e9c393
|
Fix link issue in UWP builds without functional replacement
|
2023-03-30 09:21:30 +02:00 |
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 |
Kim Kulling
|
d8201bdb6f
|
Update Readme.md
|
2023-03-25 16:00:29 +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 |