Commit Graph

8351 Commits (691dfe7012e5d3c8ff12efae1851143d9d01bbaf)

Author SHA1 Message Date
Kim Kulling a6e78f8024
Merge branch 'master' into kimkulling-travis 2020-01-17 19:43:00 +01:00
Kim Kulling 0a9d6f15f3
Merge pull request #2908 from malortie/hl1-mdl-file-size-too-small2
[MDL] Updated header to use when checking file size. (Redone)
2020-01-17 19:42:36 +01:00
Kim Kulling 1f8d5f8c13
Merge branch 'master' into kimkulling-travis 2020-01-17 19:37:28 +01:00
Kim Kulling d2e4d47908
Update appveyor.yml
fix build folder
2020-01-17 19:32:59 +01:00
Matthias Moulin cc40963e1a
Removed name of unreferenced local variable in catch block 2020-01-17 16:07:50 +01:00
Marc-Antoine Lortie 6970e70dbb [MDL] Updated header to use when checking file size. (Redone)
This is needed since it's possible to have an MDL sequence group file that has a size less than the Quake 1 MDL header.
2020-01-17 08:27:52 -05:00
Kim Kulling 25a11ac101
Update appveyor.yml
Try to enable parallel build.
2020-01-17 13:33:50 +01:00
Kim Kulling 3e1abd1039
Merge pull request #2905 from matt77hias/master
Suppressed MSVC++ warnings C4244 and C4267
2020-01-17 13:30:27 +01:00
Kim Kulling bdbe111abd
Merge branch 'master' into master 2020-01-17 08:17:45 +01:00
Kim Kulling 516f76645a
Merge branch 'master' into kimkulling-travis 2020-01-16 19:03:59 +01:00
Turo Lamminen e5864aaf5b
Merge pull request #2904 from turol/misc-fixes
Revert broken test files and improve error messages in Half-Life MDL loader
2020-01-16 19:54:00 +02:00
Matthias Moulin 986c18501a
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:31:44 +01:00
Matthias Moulin bdc10aa336
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:30:11 +01:00
Matthias Moulin 784a05651b
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:29:30 +01:00
Matthias Moulin 633a37512f
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:28:45 +01:00
Matthias Moulin 91ecad5da8
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:28:04 +01:00
Matthias Moulin 3ab21c926c
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:27:00 +01:00
Matthias Moulin fb5a30efd0
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:25:37 +01:00
Matthias Moulin e0e9ec720b
Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:24:06 +01:00
Matthias Moulin 715337aa0b
Suppressed MSVC++ warning C4244
'return': conversion from '__int64' to 'int', possible loss of data
2020-01-16 18:21:28 +01:00
Kim Kulling bd3118f896
Merge branch 'master' into misc-fixes 2020-01-16 13:50:25 +01:00
Kim Kulling 651c2ef5fe
Merge pull request #2892 from runforu/gltf_memory_leak
Fix: gltf exporting memory leak
2020-01-16 13:25:46 +01:00
Turo Lamminen 89e622060b Preserve more exceptions in Half-Life MDL loader 2020-01-16 14:02:04 +02:00
Turo Lamminen 2a366388c2 Revert Wuson.ms3d to working version 2020-01-16 13:55:34 +02:00
Turo Lamminen 08110be9f7 Revert BoxTextured.glb to working version 2020-01-16 13:41:01 +02:00
Hui.Du 1cae51615f Fix: gltf exporting memory leak 2020-01-16 12:09:31 +13:00
Turo Lamminen 2e56450984
Merge pull request #2891 from turol/more-tests
Revert broken dwarf.cob test file and add MD5 and COB unit tests
2020-01-15 18:41:45 +02:00
Kim Kulling ce087fe6e2
Update appveyor.yml
Fix the build
2020-01-15 16:03:39 +01:00
Kim Kulling f7ca69c07e
Update appveyor.yml
Next try
2020-01-15 15:53:24 +01:00
Kim Kulling 9867bdd984
Update appveyor.yml
Fix the build script.
2020-01-15 15:08:35 +01:00
Kim Kulling 23e4dd8ae5
Update appveyor.yml
Use cmake for build.
2020-01-15 14:11:40 +01:00
Turo Lamminen 542b1f7688 Add more COB importer unit tests 2020-01-15 14:34:25 +02:00
Turo Lamminen 26a80bb019 Refactor COB import test to not use a class 2020-01-15 14:15:29 +02:00
Turo Lamminen a50b94dd63 Revert test model dwarf.cob to working version 2020-01-15 14:10:09 +02:00
Turo Lamminen d6e9a15b15 Add MD5 importer unit tests 2020-01-15 13:23:13 +02:00
Kim Kulling babf9eac0f
Update appveyor.yml
Enable git clone --depth 1
2020-01-15 10:39:48 +01:00
Kim Kulling 122667b2b2
Update .travis.yml
Set depth to 1 because we do not need the history.
2020-01-15 10:36:30 +01:00
Loïc 13a2f22835 Fix Assimp patch version to match the last bug fix release 2020-01-14 16:26:24 +01:00
Kim Kulling b7d1acf0f9
Merge branch 'master' into kimkulling-patch-1 2020-01-13 17:20:10 +01:00
Kim Kulling 388211474a
Merge pull request #2877 from turol/test-md2
Add MD2 importer unit tests
2020-01-13 17:19:39 +01:00
Kim Kulling d14249e0ee
Merge branch 'master' into kimkulling-patch-1 2020-01-11 11:59:16 +01:00
Turo Lamminen 7e140ff912 Add MD2 importer unit tests 2020-01-10 13:50:16 +02:00
Turo Lamminen e5db5e84e6
Merge pull request #2875 from turol/fix-models
Revert more broken test models to working versions
2020-01-10 10:39:47 +02:00
Kim Kulling 625357685c
Update EmbedTexturesProcess.cpp
closes https://github.com/assimp/assimp/issues/2874 : fix leaked texture buffer.
2020-01-09 22:04:46 +01:00
Turo Lamminen d372d28d2e Revert more broken test models to working versions
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2861
2020-01-09 21:56:39 +02:00
Kim Kulling cacab6bf0b
Merge pull request #2868 from assimp/kimkulling-doc-patch
Update Readme.md
2020-01-09 20:06:34 +01:00
Kim Kulling 2e6ebc40d4
Merge branch 'master' into kimkulling-doc-patch 2020-01-08 20:23:14 +01:00
Turo Lamminen 7b17cb8ddb
Merge pull request #2870 from turol/fix-amf-test
Revert 3_bananas.amf.7z to working version
2020-01-08 20:43:03 +02:00
Kim Kulling a69492753a
Merge branch 'master' into fix-amf-test 2020-01-08 14:29:41 +01:00
Kim Kulling df96f5a822
Merge pull request #2866 from assimp/kimkulling-patch-1
Update glTF2Importer.cpp
2020-01-08 14:29:13 +01:00