Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,550 Commits 19 Branches 43 Tags
facffffc59dd59a0daf02273583fbd2f2a8c023f
Commit Graph

3550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
facffffc59 BlenderDNA-Generator: update license info. 2016-07-12 21:11:52 +02:00
Kim Kulling
61c3674fa5 Merge branch 'master' into coverity_scan 
Conflicts:
	test/regression/db.zip
 2016-07-12 10:17:16 +02:00
Kim Kulling
2a8936a217 Regression testsuit: fix dabatabe to latest changes. 2016-07-12 09:02:47 +02:00
Kim Kulling
9678da72c9 Public includes: add pragma statement and formalize include guard schema. 2016-07-11 20:56:38 +02:00
Kim Kulling
02602ce9af Update license date. 2016-07-10 15:34:58 +02:00
Kim Kulling
a8673d4828 Merge pull request #941 from assimp/feature/issue_940 
Feature/issue 940
v3.3.1 		2016-07-08 19:29:51 +02:00
Kim Kulling
4d012bc476 Update version. 2016-07-08 18:40:26 +02:00
Kim Kulling
e439b16689 Includes: update header to latest greatest. 2016-07-08 18:38:33 +02:00
Kim Kulling
c87375a8a8 CMake: fix version for bugfix release. 2016-07-08 18:37:25 +02:00
Kim Kulling
599e846f57 Remove dead code. 2016-07-08 18:31:19 +02:00
Kim Kulling
070fb3363f Closes https://github.com/assimp/assimp/issues/940: use standard offsetof 
instead of an own version.
 2016-07-08 18:30:26 +02:00
Kim Kulling
1ed0814f8f Merge pull request #935 from r-chris/export_precision 
setting default export precision to 17 for all exporters
 2016-07-06 19:54:46 +02:00
Kim Kulling
46e3d764f1 Merge pull request #936 from CharlyZhang/master 
update the Xcode projects  and make them work
 2016-07-06 13:42:21 +02:00
CharlyZhang
672f3a6db5 make the Xcode project SimpleAssimpViewX.xcodeproj work 2016-07-06 16:45:49 +08:00
CharlyZhang
024aee4f26 add files (C4D & 3MF format related) to the Xcode static library Project 2016-07-06 16:45:00 +08:00
CharlyZhang
9f39eeb69c make the workspaces/xcode6/Assimp.xcodeproj work 2016-07-06 15:08:28 +08:00
Chris Russ
a5b3ce9a3c reverting back to 16 digit precision export 
having to import 17 digit floats likely leads to issues in many other apps
 2016-07-06 15:33:51 +10:00
Chris Russ
10f22779f4 setting default export precision to 17 for all exporters 2016-07-06 14:49:14 +10:00
Kim Kulling
19769eef8b Version: prepare 3.3 version. v3.3 2016-07-05 18:43:16 +02:00
Kim Kulling
f8c3ca5941 Merge pull request #933 from liedtkeInTUM/master 
[Fix] Remove  CMake Warning (dev) in external/assimp/CMakeLists.txt
 2016-07-05 15:57:53 +02:00
Sven Liedtke
e16a383999 [Fix] Remove CMake Warning (dev) in external/assimp/CMakeLists.txt with mis-matching arguments for logical block 2016-07-05 10:21:29 +02:00
Kim Kulling
7c63208515 Fix resource leaks in unit tests. 2016-07-04 22:15:23 +02:00
Kim Kulling
ebb209a0d6 Merge branch 'master' of https://github.com/assimp/assimp 2016-07-04 20:19:37 +02:00
Kim Kulling
32e8c80c24 Fix resource leak. 2016-07-04 20:19:24 +02:00
Kim Kulling
614096ddb1 Merge pull request #931 from cmdrf/update-melange-sdk 
C4D Support: Update to Newest Melange SDK
 2016-07-04 15:06:58 +02:00
Kim Kulling
a62ea5497d Merge pull request #932 from r-chris/make-zlib-optional 
Allowing to enable building of zlib manually through CMake option.
 2016-07-04 15:00:13 +02:00
Fabian Herb
7b08233ef2 Fix identation 2016-07-01 17:08:28 +02:00
Fabian Herb
3c7dd2b302 More whitespace consistency 2016-07-01 17:02:54 +02:00
Fabian Herb
616aa022a7 CMake: whitespace consistency, variable naming 2016-07-01 16:57:45 +02:00
cmdrf
9c7de7b2a8 Update to latest Melange SDK 2016-07-01 14:50:46 +02:00
Kim Kulling
5dc4a126b5 Merge branch 'master' into coverity_scan 
Conflicts:
	test/regression/db.zip
 2016-06-30 19:00:22 +02:00
Kim Kulling
e7acd82b8c Merge pull request #929 from assimp/feature/issue_922 
CMake: use CMAKE_CURRENT_LIST_DIR instead of CmakeSourceDir.
 2016-06-30 01:02:32 +02:00
Kim Kulling
93caa17371 CMake: use CMAKE_CURRENT_LIST_DIR instead of CmakeSourceDir. 2016-06-30 00:42:08 +02:00
Kim Kulling
41eeacefab Merge pull request #923 from tgoulart/fix_ios_build 
Fix compilation of iOS static libraries
 2016-06-28 22:48:58 +02:00
Kim Kulling
886cea2933 Merge pull request #927 from royshil/obj_color_vertices_support 
adding support for per-vertex colors in OBJ files.
 2016-06-28 22:08:59 +02:00
Kim Kulling
19ba6448f0 OpenDDLParser: latest greatest. 2016-06-28 13:13:08 +02:00
Kim Kulling
072a9e77ad Unittests: diable broken test. 2016-06-28 11:59:20 +02:00
Kim Kulling
975cfd8f95 another try. 2016-06-28 11:30:48 +02:00
Kim Kulling
353c1efe1d Fix line break 2016-06-28 11:29:51 +02:00
Kim Kulling
428e9d60f9 Gitter-badge: fix format of the readme-file. 2016-06-28 11:28:52 +02:00
Kim Kulling
5a4b81ca63 Merge branch 'gitter-badger-gitter-badge' 2016-06-28 11:27:41 +02:00
Kim Kulling
dadbea940b README: put link to gitter badge to right place. 2016-06-28 11:26:54 +02:00
Kim Kulling
5321072007 Static code analysis: fix minor finding. 2016-06-28 11:25:04 +02:00
The Gitter Badger
87747fe5a7 Add Gitter badge 2016-06-28 09:15:04 +00:00
Roy Shilkrot
7d98643bcf adding support for per-vertex colors. 2016-06-27 20:08:22 -04:00
Thiago Goulart
867063d8c3 Fix compilation of iOS static libraries. 
1. Building for any targets using clang-703.0.31 failed with multiple errors. Using c++11 or c++14 as -std builds successfully.
2. Building for arm64 failed compilation due to duplicate constructors in rapidjson's document.h.
 2016-06-24 02:24:11 -07:00
Chris Russ
2c6c19d656 allowing to enable building of zlib manually 2016-06-22 17:38:10 +10:00
Kim Kulling
9b6de15b74 closes https://github.com/assimp/assimp/issues/904: add ai_strtof for 
VS2012.
 2016-06-20 20:30:29 +02:00
Kim Kulling
447a9642c2 closes https://github.com/assimp/assimp/issues/918: use correct lib 
install name for macos.
 2016-06-17 20:42:19 +02:00
Kim Kulling
b01e424476 Merge pull request #917 from assimp/feature/new_includes 
Feature/new includes
 2016-06-14 22:54:56 +02:00