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

7045 Commits (a2ca6910726414c7e2eba18477e7b7e0db99b367)

Author SHA1 Message Date
Kim Kulling a2ca691072
Update script_x86.iss 
Fix invalid folder names.
 2019-05-01 11:09:20 +02:00
kimkulling 800616e83a Fix if block 2019-04-30 15:51:32 +02:00
kimkulling c821c6f301 Fix names of dlls. 2019-04-30 15:33:31 +02:00
Kim Kulling 0b9c72fa94
Merge branch 'master' into collada_metadata 2019-04-29 18:49:31 +02:00
Kim Kulling ae9cb02427
Merge pull request #2441 from jslee02/fix_color_alpha 
Fix element access operator of aiColor4D
 2019-04-29 18:48:58 +02:00
Jeongseok Lee bcd17481e5 Fix element access operator of aiColor4D 2019-04-28 22:16:20 -07:00
Kim Kulling 27665ce930
Merge branch 'master' into collada_metadata 2019-04-27 10:30:49 +02:00
Kim Kulling 55cdf1d37c
Merge pull request #2437 from assimp/kimkulling-patch-4 
Update Readme.md
 2019-04-27 10:30:35 +02:00
Kim Kulling bd53e67110
Merge branch 'master' into kimkulling-patch-4 2019-04-27 09:27:39 +02:00
Kim Kulling 3824f17223
Merge pull request #2436 from assimp/kimkulling-appveyor 
Update appveyor.yml
 2019-04-27 09:26:41 +02:00
Kim Kulling 0853623924
Update appveyor.yml 
Try this solution 27eb7c5bdb
 2019-04-27 08:38:01 +02:00
Kim Kulling 6d241cc2f0
Update appveyor.yml 
Go back to normal
 2019-04-26 21:11:23 +02:00
Kim Kulling 4c3e34ba6c
Update Readme.md 
Add link to read the docs.
 2019-04-26 19:28:19 +02:00
Kim Kulling 09905c2de3
Update appveyor.yml 
disable vs2015
 2019-04-26 19:11:22 +02:00
Kim Kulling 58b1440fc8
Update appveyor.yml 
Remove cache to fix access to not cached data.
 2019-04-26 13:01:22 +02:00
RichardTea 51be6236a7 Merge branch 'master' into assimpview_unicode 2019-04-17 12:10:14 +01:00
RichardTea 7b6cb57e3b Merge branch 'collada_metadata' 2019-04-17 12:07:48 +01:00
RichardTea 00f1fd6f7c Merge branch 'master' into assimpview_unicode 2019-04-17 10:48:37 +01:00
RichardTea b515f04ce6 assimp_view is ANSI (MBCS) only 
It should really be ported to UNICODE at some point, however I do not have the DirectX9 SDK so cannot confirm whether such a port is working.
 2019-04-17 10:48:14 +01:00
RichardTea 692927a8a1 Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig 
When the generator is multi config (eg MSVC, xcode) always set the debug postfix to 'd'
 2019-04-17 10:03:18 +01:00
RichardTea 0b9da72ed8
Merge pull request #5 from assimp/master 
Rollup FBX material fixes from upstream
 2019-04-17 09:44:10 +01:00
RichardTea 9242a12bf5 Qt5 requires cmake 3.1 
Earlier versions are not supported
 2019-04-17 09:32:59 +01:00
RichardTea 836801d37e CMake updates for VS2015/cmake 3.12 onwards 
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
 2019-04-17 09:32:24 +01:00
Kim Kulling 36bce5fa00
Merge pull request #2419 from merwaaan/fix-fbx-face-material 
Fix FBX face materials not being properly loaded if the face count mi…
 2019-04-16 11:03:14 +02:00
Kim Kulling 685a56266b
Merge branch 'master' into fix-fbx-face-material 2019-04-15 09:55:38 +02:00
Kim Kulling 5bf096ab6d
Merge pull request #2410 from assimp/fbx_embedded_ascii 
FBX: add test case
 2019-04-11 12:40:13 +02:00
Kim Kulling bbaa9f330d
Merge branch 'master' into fbx_embedded_ascii 2019-04-11 10:36:29 +02:00
Kim Kulling 6ff563ec23
Merge pull request #2420 from assimp/kimkulling-dev-2 
Update Readme.md
 2019-04-11 01:13:20 +02:00
Kim Kulling e2025c3dec
Update Readme.md 
Add info about C4D-importer.
 2019-04-10 20:31:23 +02:00
Merwan Achibet c92ae50e4f Fix FBX face materials not being properly loaded if the face count mismatches the material count 2019-04-10 19:16:42 +02:00
RichardTea 1f55bdd9a7 Save/Load Collada 1.4 Root Asset Metadata 
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
 2019-04-09 16:28:15 +01:00
RichardTea 49459435df Merge branch 'master' into collada_metadata 2019-04-09 12:38:29 +01:00
RichardTea 4507f7cf46
Merge pull request #4 from assimp/master 
Fast forward
 2019-04-09 12:37:38 +01:00
Kim Kulling d72c8e9c22
Merge pull request #2414 from assimp/kimkulling-dev-2 
closes https://github.com/assimp/assimp/issues/2411: Revert parts of dynamic ixxxml linkage
 2019-04-08 21:24:28 +02:00
Kim Kulling dbd0f06d32
Update CMakeLists.txt 
Make IrrXml dynamic only on BSD
 2019-04-08 20:21:20 +02:00
Kim Kulling ef209c6eed
Update utColladaExportCamera.cpp 
Add mising override statement.
 2019-04-08 20:10:11 +02:00
RichardTea e3a397a98d
Merge pull request #3 from assimp/master 
fast forward to master
 2019-04-08 17:57:09 +01:00
RichardTea d66166675a first pass at collada metadata 2019-04-08 17:11:50 +01:00
Kim Kulling 99648b69c3
Merge branch 'master' into fbx_embedded_ascii 2019-04-08 17:38:56 +02:00
Kim Kulling d3d98a7ec0
Merge pull request #2409 from assimp/issue_2336 
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 …
 2019-04-08 17:38:40 +02:00
kimkulling cbd8b032e7 FBX: add test case 2019-04-08 17:37:40 +02:00
Kim Kulling 98ed6a2e18
Merge branch 'master' into issue_2336 2019-04-08 16:39:54 +02:00
Kim Kulling 189bb2a233
Merge pull request #2407 from mlavik1/issue_1957 
issue 1957: ASCII FBX embedded content
 2019-04-08 16:08:55 +02:00
RichardTea 2a3626577f
Merge pull request #2 from assimp/master 
Update to Assimp Master 0973f50
 2019-04-08 14:06:36 +01:00
Kim Kulling 6dec1346ed
Merge branch 'master' into issue_1957 2019-04-08 14:27:32 +02:00
Kim Kulling 0973f504b5
Merge pull request #2378 from assimp/issue_1650 
Issue 1650
 2019-04-08 14:25:25 +02:00
kimkulling 79f62b0174 closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build. 2019-04-08 14:24:33 +02:00
Kim Kulling f7d226768c
Merge branch 'master' into issue_1650 2019-04-08 13:06:30 +02:00
Kim Kulling 37357515fa
Update irrXML.h 
FIx export directive for linux.
 2019-04-08 12:49:07 +02:00
Matias Lavik ddfc140fc3 Added <stdint.h>-include 2019-04-07 00:02:22 +02:00