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

4293 Commits (23c70c901ecb63c26c42853de869e02efd370cd3)

Author SHA1 Message Date
Kim Kulling 26fba14aaf Merge branch 'master' of https://github.com/assimp/assimp 2016-03-03 15:20:22 +01:00
Kim Kulling 2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Kim Kulling e7c3a733b6 Merge pull request #812 from tgoulart/fix_switch_warning 
Fix warning when compiling using -Wswitch-enum
 2016-03-02 21:16:42 +01:00
Thiago Goulart 17f0e09bd1 Fix warning when compiling using -Wswitch-enum 2016-03-02 00:07:17 -08:00
Kim Kulling 3079b90622 Importer: when the right importer was found log this info. 2016-02-29 15:57:47 +01:00
Kim Kulling e9f47b08c5 FBXImporter: fx build. 2016-02-28 20:56:11 +01:00
Kim Kulling 28d327b7ea FBXImporter: fix build. 2016-02-28 20:27:31 +01:00
Kim Kulling 2496e8a0a3 Lib: reduce number of header files included. 2016-02-28 17:30:11 +01:00
Kim Kulling 6cf639956a Merge branch 'master' into coverity_scan 2016-02-26 12:29:21 +01:00
Kim Kulling 58fc3940f2 Obj Importer: add missing semicolon to fix the build. 2016-02-25 19:04:13 +01:00
Kim Kulling e5f07dc96c License info: fix dates 2016-02-25 18:22:59 +01:00
Kim Kulling b09d9bdfe2 Merge branch 'master' of https://github.com/assimp/assimp 2016-02-25 18:01:33 +01:00
Kim Kulling 99f00834ec closes ssues/804: add statement to take care of emissive texture, new 
version.
 2016-02-25 18:00:09 +01:00
Kim Kulling 23eab0dfab Merge pull request #798 from boxdot/master 
Fix special case in aiMatrix3x3t::FromToMatrix.
 2016-02-23 21:21:47 +01:00
Alexander Gessler 13ee28bcf6 Merge pull request #803 from akazantsev/master 
Resolves #802
 2016-02-22 23:21:57 +01:00
Andrey Kazantsev b8fbf3ad29 Resolves #802 2016-02-22 22:24:03 +02:00
Kim Kulling ff7deaa091 appveyor: add libs to build artifacts. 2016-02-20 11:14:22 +01:00
Kim Kulling 5c13b89724 appveyor: change path to build artifact. 2016-02-19 20:42:56 +01:00
Kim Kulling 767e8e0b6e appveyor: fix typo. 2016-02-19 18:40:21 +01:00
Kim Kulling 9df73a3f7d appveyor: define build artifacts. 2016-02-19 18:32:16 +01:00
Kim Kulling 6f429a63ed appveyor: remove VS 2012 from CI. 2016-02-19 16:30:20 +01:00
Kim Kulling 1558db0722 appveyor: remove buggy quotes. 2016-02-19 11:44:02 +01:00
Kim Kulling 8375cfe1ed anveyor: enable verbose output. 2016-02-19 11:07:17 +01:00
Kim Kulling acf8bf7325 Appveyor: use correct names for project generators. 2016-02-19 10:45:00 +01:00
Kim Kulling 122d93d013 Appveyor: fix path in setup. 2016-02-19 10:31:26 +01:00
Paul Holland f20a5afcf0 can't add integer to string pointer 2016-02-18 12:17:47 -08:00
Paul Holland fe68765df9 Merge remote-tracking branch 'upstream/master' 2016-02-18 12:11:57 -08:00
Kim Kulling 166d5d1d13 appveyor: Fix invalid path. 2016-02-18 18:29:25 +01:00
Alexander Gessler 38d462f0b3 Merge pull request #764 from rmitton/sib_import 
Validation fix for empty SIB scenes.
 2016-02-18 11:58:26 +01:00
Alexander Gessler 88fee56cce Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups 
use NormalizeSafe to prevent NaN when normalizing zero vectors
 2016-02-18 11:53:57 +01:00
Kim Kulling 909c5d5152 CI: Remove erroreous platform spec from appveyor file. 2016-02-17 15:17:55 +01:00
Kim Kulling 03af4b3dd4 Appveyor: add compiler setup script. 2016-02-17 13:44:33 +01:00
boxdot 6de709410f Fix special case in aiMatrix3x3t::FromToMatrix. 2016-02-15 20:53:39 +01:00
Kim Kulling d393ab11ec Appveyor: add support for VS2010. 2016-02-15 10:20:34 +01:00
Kim Kulling cb3454a3b5 Merge pull request #796 from afiskon/master 
Update pstdint.h to version 0.1.12 ( solve #795 )
 2016-02-15 10:07:41 +01:00
afiskon bf74a5a662 Update pstdint.h to version 0.1.12 ( solve #795 ) 2016-02-14 22:39:37 +03:00
Alexander Gessler 4866191b21 Merge pull request #794 from turol/master 
LWO: Fix division by zero
 2016-02-13 22:51:54 +01:00
Turo Lamminen b71bd3df84 LWO: Fix division by zero 2016-02-13 23:37:08 +02:00
Kim Kulling 322c959424 Merge pull request #791 from trond/collada_animation_clip 
Collada animation clip support
 2016-02-11 22:11:27 +01:00
Kim Kulling f0717b1d7c Merge pull request #793 from AlexBobkov/master 
Fixed installing pdb file
 2016-02-11 22:10:21 +01:00
Kim Kulling 55f285961e Merge pull request #792 from rdb/patch-1 
Fix loading of pk3 q3bsp maps
 2016-02-11 17:08:56 +01:00
Alexander Bobkov a5f9d0d3fc Fixed installing pdb file 2016-02-11 16:24:26 +03:00
rdb 7d4a713a86 Fix loading of pk3 q3bsp maps 
This fixes loading of pk3 maps.  The pk3 files contain directory entries with a size of 0, which triggered an assertion.
 2016-02-11 14:10:49 +01:00
Trond Abusdal ccd9f92533 Fixed a couple of nested template brackets that wasn't spaced out correctly. 2016-02-11 01:00:03 +01:00
Trond Abusdal 14e5cf380c Added regression test file for <library_animation_clips> support. Generated from Blender using 'Better Collada Exporter' from Godot team. 2016-02-11 00:22:32 +01:00
Vitaly Ovchinnikov 4d5df6dc9a use NormalizeSafe to prevent NaN when normalizing zero vectors 2016-02-11 12:19:06 +13:00
Trond Abusdal 7e58a47ba0 * Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes. 
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
 2016-02-10 23:57:29 +01:00
Kim Kulling d9017299a8 iObjParser: refactorings. 2016-02-10 10:40:39 +01:00
Kim Kulling 8681abe845 Obj_Importer: remove dead code. 2016-02-09 17:50:08 +01:00
Kim Kulling 1550191256 Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping 
of line during face defintion parsing.
 2016-02-08 18:07:00 +01:00