v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,082 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

8082 Commits (0a9d6f15f37205adb265ca46b3a96e6a16043603)

Author SHA1 Message Date
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
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 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
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
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 388211474a
Merge pull request #2877 from turol/test-md2 
Add MD2 importer unit tests
 2020-01-13 17:19:39 +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
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
Turo Lamminen 7b7100a94b Revert 3_bananas.amf.7z to working version 
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2857
 2020-01-08 14:20:56 +02:00
Kim Kulling 88bb0bad6a
Merge branch 'master' into kimkulling-patch-1 2020-01-08 10:31:44 +01:00
Kim Kulling 001c66ec57
Merge pull request #2867 from assimp/kimkulling-issue_2806 
Update VertexTriangleAdjacency.cpp
 2020-01-08 10:31:13 +01:00
Kim Kulling 346ab9af35
Update Readme.md 
Fix the assimp.net link, old repo was broken.
 2020-01-08 08:35:06 +01:00
Kim Kulling 37210372a8
Update VertexTriangleAdjacency.cpp 
closes https://github.com/assimp/assimp/issues/2806: calculate corret number of vertices.
 2020-01-07 21:26:37 +01:00
Kim Kulling 9b8f2970c8
Update glTF2Importer.cpp 
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
 2020-01-07 21:22:41 +01:00
Kim Kulling a62c44227a
Merge pull request #2865 from LoicFr/master 
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
 2020-01-07 21:19:27 +01:00
Kim Kulling f04573984a
Update glTF2Importer.cpp 
Remove dead code
 2020-01-07 20:41:37 +01:00
Loïc e3988cc066 Fix possible null pointer exception on scene metadata when exporting a glTF2 file 2020-01-07 16:20:33 +01:00
Kim Kulling acb8addf7d
Merge pull request #2863 from Dunni/user/dunnia/ply-export-fix 
Fix PlyExporter to support faces with 0 vertices
 2020-01-06 21:14:59 +01:00
Dunni 52a7be775d
Fix PlyExporter to support faces with 0 vertices 2020-01-06 14:57:59 +01:00
Kim Kulling 185c2fde3c
Merge pull request #2855 from felipeek/fix/collada-combining-animations 
fix: Don't combine Collada animations when channels are shared
 2020-01-04 16:57:14 +01:00
Kim Kulling cce77345e5
Update ColladaHelper.h 
Add missing include.
 2020-01-04 11:57:26 +01:00
Kim Kulling 12ee1a6776
Merge branch 'master' into fix/collada-combining-animations 2020-01-03 12:13:52 +01:00
Kim Kulling a01d7c4048
Merge pull request #2820 from RichardTea/collada_modeller_metadata 
Collada and glTF modeller metadata
 2020-01-02 20:40:41 +01:00
RichardTea ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00