1d8e854ba3
Merge branch 'master' into uv-coordinates-swapped-twice
2019-12-30 08:37:43 -05:00
6de5ff8f7d
Fixed UV coordinate swapped twice in big endian.
2019-12-30 08:30:34 -05:00
5ce373c312
Don't combine Collada animations when channels are shared
2019-12-29 16:05:33 -03:00
45601a49f7
Merge pull request #3 from assimp/master
...
Update to the latest version from upstream
2019-12-28 16:45:08 +01:00
58647c8c2e
Merge pull request #2853 from yunqiangshanbill/gltf-import-bug-fix
...
Gltf import bug fix
2019-12-28 09:08:34 +01:00
c9d9f2077d
Merge branch 'master' into gltf-import-bug-fix
2019-12-27 16:35:09 +01:00
04f7c5b67a
Merge pull request #2838 from malortie/hl1-mdl-loader
...
Added support to load Half-Life 1 MDL files.
2019-12-27 10:32:05 +01:00
d2ed36756c
fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed.
2019-12-27 11:21:05 +08:00
ab4166a279
Merge pull request #1 from assimp/master
...
sync all modify
2019-12-26 18:59:39 +08:00
2026d52df4
Improved comments in HL1MDLFile.h
2019-12-25 12:57:48 -05:00
7e957768db
Removed dead code.
2019-12-25 08:13:20 -05:00
1e29329a84
Merge branch 'master' into hl1-mdl-loader
2019-12-25 10:13:42 +01:00
70f793f52e
Merge pull request #2843 from 9739654/patch-1
...
Update SMDLoader.cpp
2019-12-24 08:13:55 +01:00
97bc855e80
Merge branch 'master' into patch-1
2019-12-23 23:27:21 +01:00
b9ac4c3fda
Merge pull request #2825 from bztsrc/master
...
MSVC workarounds
2019-12-23 23:26:52 +01:00
ae92a34d91
Update SMDLoader.cpp
...
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
2019-12-22 09:57:02 +01:00
79aeb65ab4
Merge branch 'master' into master
2019-12-22 09:18:02 +01:00
66750588cf
Merge pull request #2839 from apanteleev/vcruntime-fix
...
Made the CMake config more submodule friendly
2019-12-22 09:17:29 +01:00
4050f7601f
Merge branch 'master' into hl1-mdl-loader
2019-12-19 09:47:19 -05:00
e350650a93
Merge branch 'master' into vcruntime-fix
2019-12-19 14:26:26 +01:00
9f196f7d02
Merge pull request #2813 from umlaeute/python-fixes
...
Python fixes: ctypes declarations and cosmetics
2019-12-19 14:25:51 +01:00
ce11ae2ec8
Merge branch 'master' into python-fixes
2019-12-19 10:41:00 +01:00
49839796e6
Merge pull request #2841 from MalcolmTyrrell/fixTypos
...
Fix typos
2019-12-18 20:18:16 +01:00
6a3f2e89f3
Merge branch 'master' into hl1-mdl-loader
2019-12-18 12:40:59 -05:00
3b7e2bc3fa
Fix typos
2019-12-18 16:13:23 +00:00
607243448f
Fixed int/unsigned int comparaisons.
2019-12-18 08:33:41 -05:00
5d79639a8a
Removed unused variable.
2019-12-18 08:10:12 -05:00
87de50e1f3
Added missing parentheses around assignment in while condition.
2019-12-18 07:51:45 -05:00
02c2bfa2b8
Added missing member initializations.
2019-12-18 07:35:30 -05:00
7c2cec2182
Fixed member initialization order.
...
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
2019-12-18 07:28:52 -05:00
03a17f87fa
Made the CMake config more submodule friendly.
2019-12-17 17:54:23 -08:00
03e6e0c69e
Merge pull request #2776 from dylankenneally/warning-level-max
...
Added CMake option to set the compiler warning to max (-Wall, /W4). Off by default
2019-12-18 01:00:29 +01:00
69902c99c8
Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct.
...
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
2019-12-17 18:22:22 -05:00
188ee6562e
Moved/Added several includes to file HL1MDLLoader.h.
...
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
2019-12-17 17:47:26 -05:00
fe2fdcf77c
Removed unwanted PACK_STRUCT on union.
2019-12-17 17:27:21 -05:00
330d9ca916
Replaced strncpy by individual character assigments.
2019-12-17 16:37:32 -05:00
e85776aaab
Added missing null terminator.
2019-12-17 16:16:18 -05:00
1e1248d019
Merge branch 'master' into warning-level-max
2019-12-17 21:42:25 +01:00
a45e13b183
Fixed compilation issue.
...
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
2019-12-17 15:12:19 -05:00
4144a222d3
Added HL1 MDL loader tests.
...
Added new unit test source files.
Added MDL samples for tests.
Updated CMakeLists file to include the new unit tests.
2019-12-16 11:31:41 -05:00
eed0bd3ef6
Added support to load Half-Life 1 MDL files.
...
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
8a800e7aa5
Removed functionality and minor material-mapping fix
2019-12-15 12:25:34 +01:00
487ce954db
Merge pull request #2819 from RichardTea/partial-cleanup-m3d
...
Update M3D ASCII exporter ident and extension
2019-12-14 22:39:11 +01:00
7244f53f5f
Merge branch 'master' into partial-cleanup-m3d
2019-12-14 19:22:19 +01:00
a10b0d4de3
Requested modifications
2019-12-14 08:52:48 +01:00
0ff04b9769
Update ColladaParser.cpp
...
Fix the build and fix 2 possible nullptr dereferences.
2019-12-13 11:20:50 +01:00
512e6dff4f
Fixed ANSI C compiler issue
2019-12-13 09:16:41 +01:00
2fc72c8f72
Merge branch 'master' into master
2019-12-13 09:17:06 +01:00
453eeb65cd
Merge branch 'master' of https://github.com/bztsrc/assimp
2019-12-13 09:05:06 +01:00
f151a5d11d
MSVC2013 alternative to thread_local
2019-12-13 09:04:40 +01:00
Marc-Antoine Lortie
Marc-Antoine Lortie
Felipeek
Tomas Mariancik
Kim Kulling
bill.shan
yunqiangshanbill
Mateusz Paluch
Malcolm Tyrrell
Alexey Panteleev
bzt
Zoltan Baldaszti