Commit Graph

3409 Commits (00b574d7463ad39a7f6e70932b2e8875a0d82b01)

Author SHA1 Message Date
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
Trond Abusdal c34717639e Collada: Importer generates animations from <library_animation_clips>, if the node is present. 2016-02-07 23:36:49 +01:00
rmitton 72b5ed50e9 Bump just to get AppVeyor to re-test it. 2016-02-07 13:21:58 -08:00
Kim Kulling 2466ae6c2e Merge pull request #789 from assimp/revert-771-obj_load_forever_fix
Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)"
2016-02-07 20:03:38 +01:00
Kim Kulling 37a3976b30 Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)" 2016-02-07 20:03:24 +01:00
Kim Kulling c084a47c5d Merge pull request #771 from andrewparlane/obj_load_forever_fix
Fix issue: OBJ import takes forever (#759) (attempt 2)
2016-02-07 20:00:03 +01:00
Kim Kulling a998055cbd OpenDDLParser: add missing files. 2016-02-07 17:59:56 +01:00
Kim Kulling 522f4e0882 Closes https://github.com/assimp/assimp/issues/786:
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
Kim Kulling 7961c22c55 Closes https://github.com/assimp/assimp/issues/787: Update CHANGES. 2016-02-06 20:54:47 +01:00
Kim Kulling dfbae1294f JoinVerticesProcess: iAdd test for possible null pointer access. 2016-02-05 18:53:23 +01:00
Kim Kulling 51c9a9f80c Unittests: add test if export is disabled. 2016-02-05 18:31:19 +01:00
Kim Kulling f7d979c46e Merge pull request #783 from snikulov/gtest_upd
updated gtest repository to github
2016-02-05 18:04:01 +01:00
Sergei Nikulov 982d597acf updated gtest to github 2016-02-05 13:11:40 +03:00
Kim Kulling a74b321ed1 Add unittests for defect reproduction. 2016-02-04 20:43:02 +01:00
Kim Kulling 699aa9c583 Closes https://github.com/assimp/assimp/issues/754: use correct index
token.
2016-02-03 21:09:20 +01:00
Kim Kulling 2dc6ea85ec Merge branch 'master' of https://github.com/assimp/assimp 2016-02-03 20:20:16 +01:00
Kim Kulling aff932cd9c Fix license date. 2016-02-03 20:19:59 +01:00
Kim Kulling aef69ffe91 Merge pull request #779 from turol/master
SIBImporter: Properly fix C++11 issues for Clang
2016-02-02 20:40:52 +01:00
Turo Lamminen 0e06404ec1 SIBImporter: Properly fix C++11 issues for Clang
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
Kim Kulling d9f133edec Doc: add missing ports to start README page. 2016-02-02 17:48:23 +01:00
Kim Kulling b77228c7ea Android build doc: reformatting. 2016-02-02 11:00:28 +01:00
Kim Kulling 219bf32efe Rename android renameRename android rename. 2016-02-02 10:59:07 +01:00