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

5005 Commits (c49d12cabb668b7cf2dae20c970fdac02ab8aeec)

Author SHA1 Message Date
Kim Kulling d82fd0d750 closes https://github.com/assimp/assimp/issues/1076: use ai_assert instead 
of assert.
 2016-11-24 21:15:07 +01:00
Albin Bernhardsson 347c09c539 Put back unused line (in comments) 2016-11-24 15:15:17 +01:00
Albin Bernhardsson bde2b466be Remove unnecessary semicolon 2016-11-24 14:53:33 +01:00
Albin Bernhardsson bd6f94b926 Remove unused variable 2016-11-24 14:15:13 +01:00
Albin Bernhardsson 3b49dfe93e Comment out unused variables 2016-11-24 14:10:24 +01:00
Albin Bernhardsson 30cd60ff82 Remove unnecessary semicolons 2016-11-24 13:26:18 +01:00
Kim Kulling 1939aca31c anim-header: fix some review findings + andd base tests. 2016-11-23 22:00:52 +01:00
Kim Kulling 83e472cef3 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-23 20:20:45 +01:00
Kim Kulling d87400b76a Fix some findings in animation header. 2016-11-23 20:20:11 +01:00
Jared Mulconry f206249fbf Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 
# Conflicts:
#	code/AMFImporter_Postprocess.cpp
#	code/FBXConverter.cpp
#	code/IFCLoader.cpp
#	code/NDOLoader.cpp
#	code/glTFAsset.inl
 2016-11-23 22:24:04 +11:00
Kim Kulling ba2f377b52 Fix coverity findings. 2016-11-22 22:03:31 +01:00
Kim Kulling 61e974f767 Merge pull request #1074 from assimp/testsuite_aiMetadata 
Ue new alloc semantic when using aiMetadata + increase test coverage.
 2016-11-22 21:20:02 +01:00
Kim Kulling f45aeca3f6 Fix build: use ai_assert instead of assert. 2016-11-22 21:17:47 +01:00
Kim Kulling a446d75250 Ue new alloc semantic when using aiMetadata + increase test coverage. 2016-11-22 21:06:14 +01:00
Kim Kulling c5e3058ab3 Fix coverity findings. 2016-11-22 10:22:15 +01:00
Kim Kulling 566aa1ae00 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-21 23:55:14 +01:00
Kim Kulling c61146f52e Add unittest fixure for aiMetadata. 2016-11-21 23:54:39 +01:00
Kim Kulling 0bce2d9a9c Appveyor: fix another merge error. 2016-11-21 20:57:15 +01:00
Kim Kulling c5d7a97b93 Travis config: fix last merge issues + merge coverity check into master branch to avoid merge issues in the future on master. 2016-11-21 20:42:37 +01:00
Kim Kulling 68b8948758 Disable android build. 2016-11-21 20:31:35 +01:00
Kim Kulling eb462abf60 Fix another merge issue. 2016-11-21 20:21:26 +01:00
Kim Kulling 4880cd4a8c Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan 2016-11-21 19:09:22 +01:00
Kim Kulling e50ac81b65 Merge branch 'master' into coverity_scan 2016-11-21 18:57:56 +01:00
Kim Kulling 8a9deeb4a0 Fix coverity scan. 2016-11-21 18:55:57 +01:00
Kim Kulling 9e07701f3e Merge branch 'master' into coverity_scan 2016-11-21 10:18:17 +01:00
Kim Kulling eb6390a639 Merge pull request #1071 from jaredmulconry/master 
AMF Postprocessed Metadata given type bool regardless of original type
 2016-11-20 17:52:47 +01:00
Kim Kulling 86dd83cced Merge pull request #1073 from elect86/patch-2 
Update STLLoader.cpp
 2016-11-20 17:51:16 +01:00
Giuseppe Barbieri b6fb1f3c05 Update STLLoader.cpp 
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
 2016-11-20 15:14:33 +01:00
Jared Mulconry 7d64e4155b Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 2016-11-20 14:08:38 +11:00
Jared Mulconry ff31abf57c Fixed build warnings on MSVC14 x64 in the scene combiner. 2016-11-20 14:07:24 +11:00
Jared Mulconry 439b4861c8 Fixed build warnings on MSVC14 x64 in the SIB format sources. 2016-11-20 14:06:56 +11:00
Jared Mulconry 655a470fc9 Fixed build warnings on MSVC14 x64 in the Quake 3 format sources. 2016-11-20 13:30:20 +11:00
Jared Mulconry 98aea657ff Fixed build warnings on MSVC14 x64 in some helpers. 2016-11-20 13:18:11 +11:00
Jared Mulconry f81e28f320 Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process. 2016-11-20 13:06:50 +11:00
Jared Mulconry 3e08a47d4f Fixed build warnings on MSVC14 x64 in some scene optimisations. 2016-11-20 13:04:56 +11:00
Jared Mulconry 48e542d8d4 Fixed build warnings on MSVC14 x64 in the OpenGEX format sources. 2016-11-20 13:02:26 +11:00
Jared Mulconry 4a63f1759c Fixed build warnings on MSVC14 x64 in the Ogre format sources. 2016-11-20 12:49:33 +11:00
Jared Mulconry 0c13322089 Fixed build warnings on MSVC14 x64 in the Obj format sources. 2016-11-20 12:29:26 +11:00
Jared Mulconry 12aab0f4ef Fixed build warnings on MSVC14 x64 in the O3DGC sources. 2016-11-20 12:29:01 +11:00
Jared Mulconry 8478b03f22 Fixed build warnings on MSVC14 x64 in the NDO format sources. 2016-11-20 12:27:04 +11:00
Jared Mulconry 745f754310 Fixed build warnings on MSVC14 x64 in the Message Proc source. 2016-11-20 12:04:50 +11:00
Jared Mulconry 2946a7349b Fixed build warnings on MSVC14 x64 in the MS3D format sources. 2016-11-20 02:40:36 +11:00
Jared Mulconry 923b014472 Fixed build warnings on MSVC14 x64 in the MD3 and MD5 format sources. 2016-11-20 02:40:18 +11:00
Jared Mulconry 60cd4605eb Fixed build warnings on MSVC14 x64 in the Material System source. 2016-11-20 02:11:01 +11:00
Jared Mulconry 335003a5a3 Fixed build warnings on MSVC14 x64 in the LWS format sources. 2016-11-20 02:03:53 +11:00
Jared Mulconry 2c93e29dcc Fixed build warnings on MSVC14 x64 in the LWO format sources. 2016-11-20 02:01:57 +11:00
Jared Mulconry 4df18f93ea Fixed build warnings on MSVC14 x64 in the limit bone weights post-process. 2016-11-20 01:53:47 +11:00
Jared Mulconry 1e2c0279b0 Fixed build warnings on MSVC14 x64 in the IRR format sources. 2016-11-20 01:52:04 +11:00
Jared Mulconry c7efb50ad1 Fixed build warnings on MSVC14 x64 in the core Importer. 2016-11-20 01:36:33 +11:00
Kim Kulling 7ceaca61fd Set right source encoding for coveralls-lcov. 2016-11-19 15:23:08 +01:00