Commit Graph

8476 Commits (8c3b3744868af19429196811d85d694675d59fcd)

Author SHA1 Message Date
Kim Kulling d59ffcb674
Merge branch 'master' into assimp-cmd-improved-error-codes 2020-01-27 20:44:48 +01:00
Kim Kulling 46faa1e523
Merge branch 'master' into revert-corrupt-image-files 2020-01-27 20:24:17 +01:00
Kim Kulling 1e3f7137fa
Merge pull request #2962 from RichardTea/macos_rpath
Remove explicit setting of macos install_name
2020-01-27 20:21:18 +01:00
RichardTea 4337c07e4b Remove explicit setting of macos install_name
Use CMake default behaviour for libassimp

Fixes #2961
2020-01-27 17:08:56 +00:00
tellypresence 9e1eba7912 Revert image files corrupted by a8a1ca9 2020-01-27 19:58:05 +09:00
Marc-Antoine Lortie ab284f7996 Fixed enumeral mismatch error in build. 2020-01-26 14:02:16 -05:00
Marc-Antoine Lortie b23c0b0637 Uniformized error codes (return values) in assimp_cmd. 2020-01-26 13:10:21 -05:00
Marc-Antoine Lortie 5d5a4faf47
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-25 13:35:14 -05:00
Marc-Antoine Lortie 5ab67f6491
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-25 13:34:59 -05:00
Kim Kulling a1fbe74e87
Merge pull request #2952 from malortie/hl1-mdl-load-external-textures
Added support to load HL1 MDL external texture files directly.
2020-01-25 19:23:05 +01:00
Kim Kulling fc4ae3586e
Update utMDLImporter.cpp
unittests: Fix compiler warning: comparison between signed and unsigned.
2020-01-25 11:31:14 +01:00
Marc-Antoine Lortie 48bb2978af Added support to load HL1 MDL external texture files directly. 2020-01-24 13:14:37 -05:00
Marc-Antoine Lortie e093066a2c
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-24 07:22:59 -05:00
Marc-Antoine Lortie b9ae88f200
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-24 07:20:03 -05:00
Kim Kulling 57c735cdca
Merge branch 'master' into master 2020-01-24 11:30:59 +01:00
Kim Kulling dbee3807b3
Merge pull request #2948 from malortie/update-texture-format-size
Updated places where read/write for achFormatHint (Redone).
2020-01-24 11:27:00 +01:00
Marc-Antoine Lortie 770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Kim Kulling 316a8dff4e
Merge pull request #2928 from malortie/hl1-mdl-deletion-temp-nodes
[MDL HL1] Fixed children nodes not deleted.
2020-01-23 20:38:53 +01:00
Kim Kulling e569831253
Update HL1MDLLoader.cpp
Fix possible x64 issue.
2020-01-23 16:20:34 +01:00
Kim Kulling b74b96fca4
Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-23 15:17:19 +01:00
Kim Kulling 5b09758f15
Update HL1MDLLoader.cpp
Fix compiler warning
2020-01-23 15:04:07 +01:00
Kim Kulling 259d670f54
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-23 11:14:05 +01:00
Kim Kulling eb5c581b82
Merge pull request #2933 from malortie/update-copyright-end-date
Updated copyright dates.
2020-01-23 11:02:18 +01:00
Kim Kulling 092883cf19
Merge branch 'master' into update-copyright-end-date 2020-01-22 18:03:43 +01:00
Marc-Antoine Lortie 2081b71838
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-22 10:52:51 -05:00
Marc-Antoine Lortie 11d98e7cf6
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-22 10:47:34 -05:00
Turo Lamminen eb5b3bc347
Merge pull request #2940 from turol/memleak-fix
Fix memory leak in .X importer
2020-01-22 17:18:57 +02:00
Marc-Antoine Lortie 3e8a33aae3 Fixed wrong texture format used in HL1 MDL loader. 2020-01-22 10:02:38 -05:00
Marc-Antoine Lortie ff8a924ffb [HL1 MDL] Removed downscale for textures with dimensions greater than 256. 2020-01-22 09:09:39 -05:00
Loïc 2ebafe0693 Fix version revision formatting in glTF metadata 2020-01-22 12:40:57 +01:00
Turo Lamminen a74e13d6b2 Re-enable dwarf.x import test 2020-01-22 12:22:52 +02:00
Turo Lamminen 1edb52c0de ScenePreprocessor: Assert some properties about animation channels 2020-01-22 12:22:52 +02:00
Turo Lamminen aee292e367 Whitespace 2020-01-22 12:22:52 +02:00
Turo Lamminen 288a638a83 X: Only create animation key arrays if there are some keys 2020-01-22 12:22:52 +02:00
Turo Lamminen a8698f7e76
Merge pull request #2884 from LoicFr/master
Fix Assimp patch version to match the last bug fix release
2020-01-22 12:21:52 +02:00
Kim Kulling 3cf7d955f3
Update HL1MDLLoader.cpp
Fix compiler warning
2020-01-22 10:06:40 +01:00
Kim Kulling 6a5ab0381d
Update HL1MDLLoader.cpp
Add missing const
2020-01-22 09:46:37 +01:00
Kim Kulling da2b671679
Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-21 19:39:50 +01:00
Kim Kulling e27b54f504
Update HL1MDLLoader.cpp
Fix review findings.
2020-01-21 19:39:29 +01:00
Kim Kulling cebb96aa5b
Merge branch 'master' into master 2020-01-21 18:48:25 +01:00
Turo Lamminen 2ace0e667e
Merge pull request #2936 from turol/more-tests
Add more unit tests
2020-01-21 19:07:59 +02:00
Marc-Antoine Lortie caf9e31181
Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-21 11:57:49 -05:00
Marc-Antoine Lortie 552519c2c4
Merge branch 'master' into update-copyright-end-date 2020-01-21 11:57:07 -05:00
Turo Lamminen c2a74c61f4 Add more X unit tests 2020-01-21 15:14:34 +02:00
Turo Lamminen d4d19b7062 Add more AC unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen c407892c9c Refactor AC unit test 2020-01-21 15:11:50 +02:00
Turo Lamminen 0b776f16cb Add more 3D unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen 461f9923a7 Refactor 3D import unit test 2020-01-21 15:11:50 +02:00
Turo Lamminen 69284bdef9 Add more XGL unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen 2875f7fd5f Refactor XGL unit test 2020-01-21 15:11:50 +02:00