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

7065 Commits (7c485524622cb1cd4f74b5edd6d0863746c4d5d8)

Author SHA1 Message Date
Kim Kulling 7c48552462
Merge branch 'master' into master 2019-05-01 18:15:22 +02:00
Kim Kulling 647d2f8d18
Merge pull request #2418 from Cgettys/fix-mingw-debug-build 
Fix mingw debug build
 2019-05-01 18:13:12 +02:00
Kim Kulling e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build 2019-05-01 17:04:45 +02:00
Kim Kulling 37bf09ef0b
Merge pull request #2442 from assimp/RichardTea-collada_metadata 
Richard tea collada metadata
 2019-05-01 17:04:01 +02:00
Kim Kulling d9cfc48a66
Update script_x86.iss 
fix export lib name
 2019-05-01 15:53:04 +02:00
Kim Kulling c93886e87b
Update script_x64.iss 
Fix eport lib name.
 2019-05-01 15:52:27 +02:00
Kim Kulling 3ee85a8cc8
Update script_x86.iss 
Fix another wrong folder.
 2019-05-01 15:13:56 +02:00
Kim Kulling 615a78e38f
Update script_x86.iss 
Fix wrong folder for assimp.exe
 2019-05-01 14:41:51 +02:00
Kim Kulling 84e7f542fb
Update script_x86.iss 
Fix version of dll.
 2019-05-01 12:10:52 +02:00
Kim Kulling 6ff7635338
Update script_x64.iss 
put icons into comments.
 2019-05-01 11:10:16 +02:00
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 1ff10c1ade
Merge branch 'master' into master 2019-04-16 16:38:53 +02: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
Simon Puente 9b9b2c8339
Fix typo on README.md 
changing "fascade" to "facade"
 2019-04-14 10:13:32 -07: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
Charlie Gettys 2f6f716512 Clarify build instructions 2019-04-10 12:42:19 -04:00
Charlie Gettys 1b0c1139eb Fix more codacy warnings! 2019-04-10 11:45:30 -04:00
Charlie Gettys c1f3624f5b Fix more codacy warnings 2019-04-10 11:06:00 -04:00
Charlie Gettys 24a0aaeb77 Fix Codacy Warning 2019-04-10 11:02:36 -04:00
Charlie Gettys 567a645c4f * Improve error message for new check on MinGW compiler version 2019-04-10 10:31:57 -04:00
Charlie Gettys 6a373d55c7 * Add notes on MinGW compiler version requirements 
* Add check on MinGW compiler version to force compliance.
* Closes #2315 ?
 2019-04-10 10:07:24 -04:00
Charlie Gettys f7384dec95 Possible fix for #2406. Shouldn't affect other compiled files, but have 
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
 2019-04-10 09:45:31 -04:00
Charlie Gettys 9aae110161 * Remove old non-maintained mingw makefile to prevent confusion 
* Add notes on building with MinGW to Build.md
 2019-04-10 09:29:21 -04:00