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

3182 Commits (ce64dfb3fd9bdee78f21f023c307394bca20651a)

Author SHA1 Message Date
Alexander Gessler 1b3381d03d Merge pull request #672 from Ang3lus/Fix-mtl-realtive-path 
Properly build path to the mtl file when loading obj
 2015-10-25 20:26:49 +01:00
Łukasz Twarduś 3274bcf8d6 Properly build path to the mtl file when loading loading obj 2015-10-25 20:04:50 +01:00
Kim Kulling adb88aecde Update Readme.md 
Add link to webirc-client to join assetimporterlib channel on freenode.
 2015-10-20 13:57:29 +02:00
Alexander Gessler 282a913b7f Merge pull request #670 from romeoxbm/master 
Added support for reflection maps for OBJ files
 2015-10-16 12:07:16 +02:00
Francesco Guastella 2750f8da24 Added support for reflection maps for OBJ files 2015-10-15 15:46:35 +02:00
Alexander Gessler f489a7d076 Merge pull request #669 from Schebb/master 
Fixed issue in PlyParser (uint16 values misparsed)
 2015-10-12 20:57:17 +02:00
Sebastien Bonopera 62ec784cef Fixed issue in PlyParser (uint16 values misparsed) 2015-10-12 20:08:25 +02:00
Alexander Gessler eb01a1ebdf Dummy edit to trigger CI. 2015-10-10 13:54:16 +02:00
Alexander Gessler 878d0745d3 Merge pull request #640 from skyjake/md5-fix 
MD5: Fix quaternion conversions
 2015-10-10 13:53:27 +02:00
Kim Kulling a1be9285b4 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-08 10:25:35 +02:00
Jaakko Keränen 1a1fd897b6 Updated regression test database for MD5 files 2015-10-07 17:02:48 +03:00
Jaakko Keränen bfe3bee34b Merge branch 'master' into md5-fix 2015-10-07 16:49:45 +03:00
Alexander Gessler 1f113ca5ff Merge pull request #666 from Lectem/patch-1 
remove memory.h dependancy
 2015-10-07 01:37:14 +02:00
Alexander Gessler 5778b7ed9a Merge pull request #668 from assimp/acgessler-patch-3 
Let appveyor decide on OS version, hopefully fixes appveyor failure.
 2015-10-06 19:56:19 +02:00
Alexander Gessler b5be5a64f7 Let appveyor decide on OS version, hopefully fixes appveyor failure. 2015-10-06 17:51:23 +02:00
Alexander Gessler 709f19e5ab Merge pull request #664 from Tcll/master 
Added auto-detection of numpy
 2015-10-04 16:59:24 +02:00
Kim Kulling e7fa8fa8ae OpenDDLParser: add missing files. 2015-10-02 00:38:50 +02:00
Kim Kulling 4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Lectem 6f0bc9bcb2 remove memory.h dependancy 
Some embedded (or exotic) systems won't provide this header, and it seems to be unused (since memcpy is in string.h).
Tested on MinGW and VS2015.
 2015-09-30 09:16:18 -04:00
Alexander Gessler c65d2dc05c Merge pull request #659 from Loftilus/master 
Add Boost 1.59
 2015-09-28 23:15:55 +01:00
Tcll 5ce968c67f Added auto-detection of numpy 2015-09-28 14:18:22 -04:00
Tcll 2e725c0dc5 Added auto-detection of numpy 
If numpy is not installed, pyassimp returns lists to allow the user to manage the data type.
 2015-09-28 14:15:06 -04:00
Kim Kulling 7ed32fd5a9 fix typo. 2015-09-27 20:49:15 +02:00
Kim Kulling 1fbc0cc276 DefaultIOSystem: fix typo in macro. 2015-09-27 10:51:33 +02:00
Kim Kulling f5c8f7b5e5 DefaultIOSystem: close cygwin issue assimp/assimp/issues/660. 2015-09-27 01:02:12 +02:00
Kim Kulling d06945f17e DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32 
as well.
 2015-09-24 23:51:04 +02:00
Kim Kulling 3fc251b326 BaseImporter: fix typo and rename attributes for better readability. 2015-09-24 00:57:47 +02:00
Kim Kulling ef6baa0acf DefaultIOSystem: use correct define to detect Visual Studi compiler. 2015-09-22 00:23:33 +02:00
Kim Kulling 34ee4c4b9a DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to 
detect vs-compiler.
 2015-09-21 20:43:58 +02:00
Kim Kulling 6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp 2015-09-21 17:34:01 +02:00
Kim Kulling ca6296f609 STLLoader: mak functions local. 2015-09-21 17:33:41 +02:00
Kim Kulling f2c2bc6945 CMake: add windows 8.1 search path for DirectX SDK, closes 
assimp/assimp/issues/631
 2015-09-21 17:31:27 +02:00
Håvard Mathisen 367c9980b2 Add Boost 1.59 2015-09-20 17:15:01 +02:00
Kim Kulling e159728307 Update Readme.md 
Update contect info: now add an irc channel on freenode
 2015-09-15 08:55:40 +02:00
Kim Kulling bd6a069fa8 Merge pull request #651 from abma/master 
fix #634, remove -fPIC for static builds / 32 bit
 2015-09-10 18:15:47 +02:00
Léo Terziman d1e21045dc Merge remote-tracking branch 'official/master' into contrib 2015-09-07 11:49:41 +02:00
Kim Kulling ba37e362e8 Sample: fix https://github.com/assimp/assimp/issues/113, remove deprecated makefile. 2015-09-04 17:10:51 +02:00
abma d49e47c25c fix #431 2015-09-02 10:10:30 +02:00
abma fff2c4141e fix #634 2015-09-02 09:56:58 +02:00
Kim Kulling e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Kim Kulling 9708a4db93 Subdivision: fix compiler warning from debug check. 2015-08-30 13:48:00 +02:00
Alexander Gessler 305e27d1a5 Merge pull request #645 from l337r007/fix-osx-cmake 
CMake: Don't try to set property on target before it is defined.
 2015-08-29 14:58:53 +02:00
Alexander Gessler ce5baa95ca Merge pull request #647 from Gargaj/patch-1 
add opencollada extension
 2015-08-29 14:58:27 +02:00
Alexander Gessler ea45a9779e Merge pull request #648 from Gargaj/master 
Remove junk files
 2015-08-29 14:58:00 +02:00
Gargaj 1f6cead81b remove junk 2015-08-29 13:39:43 +02:00
Gargaj 9885c3e551 add opencollada extension 2015-08-28 16:20:17 +02:00
Wolfgang Herget 9f157ed9b8 CMake: Don't try to set property on target before it is defined. 
The exact same code this commit removes is repeated in line 748.
There, it actually works, since the "assimp" target is defined there.
 2015-08-26 12:36:57 +02:00
Jaakko Keränen d74a1149b7 MD5: Fix quaternion conversions 
Some of the quaternions loaded from MD5 files were not converted
to follow Assimp conventions.

https://github.com/assimp/assimp/issues/495
 2015-08-18 11:49:06 +03:00
Kim Kulling 4afddf316f Merge pull request #632 from turol/afl-fixes 
Random crash fixes
 2015-08-14 16:13:54 +02:00