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

3683 Commits (c11ae8e72240f79b6014cda69b12ace23487ad17)

Author SHA1 Message Date
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
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
Kim Kulling 814d2e7821 Merge branch 'master' of https://github.com/assimp/assimp 2016-06-04 19:04:06 +02:00
Kim Kulling 0a1dda22b2 ColladaParser: add warning when empty semantic will be parsed. 2016-06-04 17:53:51 +02:00
Kim Kulling bc0393669b Update setup.py 
Update url of asset importer lib repo home.
 2016-05-27 10:56:37 +02:00
Kim Kulling d67c8c29b6 Merge pull request #898 from turol/cxx11-refactor 
Use C++11 range-based for loops
 2016-05-26 16:56:07 +02:00
Kim Kulling f6ee819a42 Update regression test results. 2016-05-26 01:18:37 +02:00
Kim Kulling 8fa0071d16 closes https://github.com/assimp/assimp/issues/892: add own to_string 
implementation.
 2016-05-26 00:44:29 +02:00
Kim Kulling 4e982c0538 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-26 00:41:48 +02:00
Kim Kulling 2cbbc3da09 OpenGEX-Importer: remove dead code. 2016-05-26 00:41:31 +02:00
Kim Kulling 0f1a625be7 Update .travis.yml 
Disable osx temporary, I need more time to learn.
 2016-05-25 11:57:55 +02:00
Kim Kulling abad093d09 Update OpenGEXImporter.cpp 
Fix compiler warning: remove unused variables.
 2016-05-25 10:18:24 +02:00
Kim Kulling 5463146688 Add std::string header. 2016-05-25 00:58:05 +02:00
Kim Kulling f9f493d017 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-25 00:27:16 +02:00
Kim Kulling 037fec275c std::to_string: add replacement for android build chain. 2016-05-25 00:26:41 +02:00
Turo Lamminen 381f87507f SplitLargeMeshes: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 896ab8eee2 Unreal: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen d238597459 Raw: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 6c9c040419 Q3BSP: Use C++11 range-based for loop 2016-05-23 17:33:51 +03:00
Turo Lamminen a09a6a40c0 OpenGEX: Use C++11 range-based for loop 2016-05-23 17:33:49 +03:00
Turo Lamminen 32e4dd0bd1 Ogre: Use C++11 range-based for loop 2016-05-23 17:30:48 +03:00
Turo Lamminen 3eb9b8e91b NFF: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen ac676d4d3c MD5: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen b9fbfbc18a LWO: Use C++11 range-based for loop 2016-05-23 17:30:42 +03:00
Kim Kulling 610cea8649 Update .travis.yml 
Try to enable osx-builds for travis.
 2016-05-23 15:12:29 +02:00
Alexander Gessler cd4f212b5f Merge pull request #891 from ciechowoj/blender_materials 
Blender materials
 2016-05-22 14:39:45 +02:00
Turo Lamminen 3031470ec1 IRR: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen c7c756d344 FBX: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 8566b9aa90 D3MF: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 52405bbe1b Collada: Use C++11 range-based for loop 2016-05-22 13:57:11 +03:00
Turo Lamminen f0ebb40f19 ASE: Use C++11 range-based for loop 2016-05-22 13:57:09 +03:00
Turo Lamminen b345f79d45 3DS: Use C++11 range-based for loop 2016-05-22 13:57:06 +03:00
Kim Kulling 38ce71d5a0 Update glTFAsset.inl 
closes https://github.com/assimp/assimp/issues/893: fix invalid memcpy usage.
 2016-05-19 09:10:56 +02:00
Kim Kulling c9c6fda28e Merge pull request #889 from ciechowoj/area_lights 
Adds support for area lights.
 2016-05-18 00:11:05 -07:00
Kim Kulling 84b9df3182 Merge pull request #890 from WroughtIronGames/master 
Add fix for IRR vs IRRMESH importer registry issue
 2016-05-17 14:35:42 -07:00
ciechowoj c554b55f97 Merge branch 'blender_materials' 
Conflicts:
	test/CMakeLists.txt
 2016-05-17 22:52:18 +02:00
ciechowoj c4a542a994 Adds blender material loading. 2016-05-17 21:17:51 +02:00
Kim Kulling 5168a6c8ca Regression tests: update database. 2016-05-17 07:46:51 -07:00
Richard Selneck fc5464eb38 Pull from upstream, 5/17/2016 2016-05-17 08:44:38 -04:00