Commit Graph

4546 Commits

Author SHA1 Message Date
Kim Kulling
c27f35a6fd Update .travis.yml
remove dead code.
2017-06-28 20:18:37 +02:00
Kim Kulling
0702778761 Merge branch 'master' into coverity_scan 2017-06-26 22:27:02 +02:00
Kim Kulling
9ffc1a97c1 Merge pull request #1321 from pdaehne/master
Fixes for X3DImporter/X3DExporter
2017-06-26 21:04:25 +02:00
Patrick Dähne
d8cac6eb24 Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet 2017-06-26 15:25:15 +02:00
Kim Kulling
e6cfe6b5c8 Merge branch 'master' into coverity_scan 2017-06-25 13:25:32 +02:00
Kim Kulling
afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Patrick Dähne
aaa476cb10 X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags 2017-06-23 11:59:14 +02:00
Patrick Dähne
3c8a4a5abb X3D Exporter: fixed missing attributes 2017-06-22 20:48:33 +02:00
Patrick Dähne
855589d2a1 X3D importer: Fixed import of normals for the single index / normal per vertex case 2017-06-22 18:54:03 +02:00
Patrick Dähne
6118f77d3b X3D importer: Fixed handling of inlined files 2017-06-22 16:29:26 +02:00
Patrick Dähne
840ed9dd34 X3D importer: fixed whitespace handling (issue #1202) 2017-06-22 15:05:23 +02:00
Kim Kulling
56a9d5c659 Update Readme.md
Inproved readme.
2017-06-22 10:11:54 +02:00
Kim Kulling
f6c4edeb7d Update Readme.md
Add the donation button.
2017-06-22 10:07:02 +02:00
Kim Kulling
6aca0f86b4 Merge pull request #1314 from jamesgk/gltf-export
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-22 08:31:07 +02:00
Kim Kulling
b26add35a0 Merge pull request #1311 from PetrPPetrov/master
Fixed bug in material color processing
2017-06-22 08:30:11 +02:00
Kim Kulling
735e64309b LWO: use forward declaration in header. 2017-06-21 23:06:53 +02:00
Kim Kulling
bd2af6591f Fix compiler warnings. 2017-06-21 23:02:46 +02:00
Kim Kulling
5011e382c7 unittest: fix compiler warning. 2017-06-21 23:02:26 +02:00
jamesgk
7e45c63901 GLTF exporter: ensure buffer view byte offsets are correctly aligned 2017-06-21 09:58:24 -07:00
Kim Kulling
3ed08971c4 Merge pull request #1313 from assimp/issue_586_make_scenecombiner_public
Issue 586 make scenecombiner public
2017-06-21 16:41:47 +02:00
Kim Kulling
439409bef2 SceneCombiner: fix the build. 2017-06-21 15:24:06 +02:00
Kim Kulling
b727420cf2 SceneCOmbiner: Fix the build. 2017-06-21 14:31:37 +02:00
Kim Kulling
612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Petr Petrovich Petrov
323e470b3e Fixed bug in material color processing
Thanks to @evgeny-panasyuk
2017-06-20 14:29:16 +03:00
Kim Kulling
51b915c97b openddlparser: closes https://github.com/assimp/assimp/issues/1271. 2017-06-19 21:07:18 +02:00
Kim Kulling
d3140a68ab Merge branch 'master' of https://github.com/assimp/assimp 2017-06-17 21:17:39 +02:00
Kim Kulling
c62429998e Merge pull request #1310 from assimp/new_cpputf8_issue_1309
New cpputf8 issue 1309
2017-06-17 21:17:05 +02:00
Kim Kulling
64cbc69337 remove dead code. 2017-06-17 20:36:59 +02:00
Kim Kulling
d7e13e67c4 Utf8: integrate new lib. 2017-06-17 19:38:47 +02:00
Kim Kulling
6e1034996e UTF8Encoding: introduce new lib. 2017-06-16 16:43:39 +02:00
Kim Kulling
79818145a7 ObjImporter: remove dead code. 2017-06-15 20:24:10 +02:00
Kim Kulling
51520cb5f1 unittest: Fix compiler warning 2017-06-15 08:37:44 +02:00
Kim Kulling
a5a5343304 travis ci: enable sudo support. 2017-06-13 20:29:25 +02:00
Kim Kulling
056b6621ef Merge pull request #1304 from malytomas/master
fixed CMAKE_MODULE_PATH overwriting previous values
2017-06-12 09:12:49 +02:00
Tomas Maly
4399922ea1 fixed CMAKE_MODULE_PATH overwriting previous values 2017-06-10 20:12:12 +02:00
Kim Kulling
e1df9e5be9 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-10 11:19:25 +02:00
Kim Kulling
7977ded078 Merge pull request #1300 from assimp/ply_export_test
ply-exporter: add unittest.
2017-06-09 23:02:30 +02:00
Kim Kulling
616a18b0c7 Unittests: fix uppercase typo in export path for ply export test. 2017-06-09 21:57:41 +02:00
Kim Kulling
6329a0e62b Merge branch 'master' of https://github.com/assimp/assimp 2017-06-09 20:24:31 +02:00
Kim Kulling
ad74bfc260 Unitetsts: reformats. 2017-06-09 20:20:24 +02:00
Alexander Gessler
fae5a0e71a Merge pull request #1302 from terziman/master
Fix IFC bug of partially imported models
2017-06-09 20:14:51 +02:00
Leo Terziman
4974c99288 Merge remote-tracking branch 'github/master' into contrib 2017-06-08 11:01:11 +02:00
Kim Kulling
1eb1c5ed4e Create .travis.yml
Fix build.
2017-06-08 09:13:44 +02:00
Kim Kulling
ab9aa67c49 travis: exclose some build env to avoid double tests. 2017-06-07 21:10:52 +02:00
Kim Kulling
0d3e826182 Matrix: some reformattings. 2017-06-07 20:23:50 +02:00
Kim Kulling
ea61e8bc5b Merge pull request #1298 from severin-lemaignan/master
Revert "Installing assimp library as well"
2017-06-07 14:41:52 +02:00
Kim Kulling
548c09271b ply-exporter: add unittest. 2017-06-07 14:06:38 +02:00
Kim Kulling
30e88af520 Merge pull request #1299 from assimp/travis_osx_support
travis-ci: reenable osx.
2017-06-07 13:41:09 +02:00
Kim Kulling
1792333031 travis-ci: fix unittest executor. 2017-06-07 11:48:00 +02:00
Kim Kulling
098e2ffaf9 travis-ci: disable tests for osx. 2017-06-07 10:30:40 +02:00