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

8841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kim Kulling
62e07a8af0 closes https://github.com/assimp/assimp/issues/911: use correct include 
path for unzip, when detected.
 2016-06-14 20:27:40 +02:00
Kim Kulling
f19dadbe97 Disable regression test suite: shall be run on a separate branch. 2016-06-14 20:27:16 +02:00
Kim Kulling
334ac9a7d0 Merge pull request #908 from Adjective-Object/master 
Added 'joint' node type to Collada export
 2016-06-13 11:35:11 +02:00
Kim Kulling
e834d5a50a Merge pull request #916 from likangning93/gltfErrors 
Fixed some gltf errors
 2016-06-13 11:34:34 +02:00
Kim Kulling
950eb7ef9a Add project root to include. 2016-06-11 01:14:25 +02:00
Kangning Li
f15b6177f7 glTFExporter fixes: spaces to tabs 2016-06-10 13:41:59 -04:00
Kangning Li
32d9ef042a Merge branch 'master' into gltfErrors 2016-06-10 09:51:35 -04:00
Kangning Li
c98e77907c fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets 2016-06-10 09:49:04 -04:00
Kim Kulling
dbcb30f7cf Merge pull request #909 from assimp/feature/new_includes 
Use new include bracktes.
 2016-06-07 21:57:42 +02:00
Kim Kulling
81773b4e4e Update fast_atof.h 
Fix include brackets.
 2016-06-07 11:51:09 +02:00
Kim Kulling
7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
Kim Kulling
4e3baf7cb7 Update regression tests. 2016-06-06 21:38:01 +02:00
Kim Kulling
81f0322c2b Update regression suite. 2016-06-06 21:26:11 +02:00
Maxwell Huang-Hobbs
d23439451a Added 'joint' node type to Collada export 2016-06-05 21:04:02 -04:00
Kim Kulling
d64006b6b3 Merge pull request #907 from assimp/bugfix/issue_888 
Closes issue888: fix compiler warnings for using a gnu-extension
 2016-06-05 22:31:31 +02:00
Kim Kulling
398595225e Closes issue888: fix compiler warnings for using a gnu-extension ( 
anonymous structs ).
 2016-06-05 21:06:05 +02:00