032fbe3fe5
Merge branch 'master' of https://github.com/assimp/assimp
2015-11-23 21:29:51 +01:00
70540616ce
issue 693: add missing release call in c-export interface.
2015-11-23 21:28:35 +01:00
f94bc8d66e
Initial support for FBX embedded textures
2015-11-23 19:49:54 +01:00
24b68b1e3d
Support instance_image in Collada 1.5 files
...
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
2015-11-19 17:36:23 -08:00
916cfb9d53
Merge pull request #690 from dankex/light
...
Add new light type 'ambient' to match light.h
2015-11-16 23:01:40 +01:00
9721759da4
Merge pull request #691 from dankex/androidjni
...
Fix AndroidJNI header path in CMakelists.txt
2015-11-16 13:40:44 +01:00
57d7085fb8
Fix AndroidJNI header path in CMakelists.txt
2015-11-15 22:53:11 -08:00
40ee575322
Add new light type 'ambient' to match light.h
2015-11-15 16:49:39 -08:00
7cc90c106f
Merge pull request #689 from umlaeute/debian-fixes-3.2
...
Debian fixes 3.2
2015-11-15 09:59:23 +01:00
7806e991d9
Convert Windows-1252 charset to UTF-8
...
Windows-1252, seriously?
(this hard-to-detect weirdo charset really makes some problems with some
cmdline text-tool)
2015-11-13 23:01:49 +01:00
989e8af3fb
fix argument check for assimp cmdline tool
...
`assimp cmpdump` expects two files as arguments.
so we need to check for at least 2 extra arguments (rather than only check
for !<1 and access both)
2015-11-13 22:33:53 +01:00
756cfd4f74
fix compilation on BigEndian
...
cannot pass a function by reference where an lvalue is expected
(only applies to bigendian, where a macro expands to a byteswap function)
Closes https://github.com/assimp/assimp/issues/613
2015-11-13 22:33:20 +01:00
e6ac1ed66a
glTF-Importer: add files.
2015-11-08 20:29:05 +01:00
02ad376631
assimp/issues/685: add test for correct usage.
2015-11-07 10:00:55 +01:00
c318d648ff
CMake: set version number to 3.2
2015-11-03 19:47:37 +01:00
655cb65ab2
Version: increase version from 3.1.1 to 3.2.
2015-11-03 19:43:02 +01:00
2fa797949b
Update Readme.md
...
The 3000. commit :-)
2015-11-03 17:12:56 +01:00
54c77e78b3
Update INSTALL
...
Add missing win32-build info and fix one missing statement for unix-build.
2015-11-03 10:51:13 +01:00
2997d4308f
Merge branch 'master' of https://github.com/assimp/assimp
2015-11-02 21:09:54 +01:00
0ea4682586
Collada Export test: fix unit test for lightsCollada Export test: fix unit
...
test for lights..
2015-11-02 21:09:26 +01:00
50b98faae6
Merge pull request #682 from DaveJarvis/patch-1
...
Unix build instructions
2015-11-02 21:05:55 +01:00
97d5b1c822
Unix build instructions
...
Added actual instructions rather than telling people to go read about where to find the instructions to read. Note that simple Windows instructions should be added as well.
2015-11-01 15:57:29 -08:00
c642d9f25e
Collada exporter: fix access violation.
2015-11-01 15:15:39 +01:00
95c20cb5ab
Collada exporter: fix invalid access to already release scene after
...
reimporting exported scene.
2015-11-01 13:48:55 +01:00
6be8df5fde
Boost::tuple: fix compiler-specifc test.
2015-11-01 12:20:35 +01:00
eadc6116c0
OpenDDLParser: latest greatest.
2015-10-31 09:43:34 +01:00
6f75ea5702
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-31 09:07:21 +01:00
4fb7e3a779
Merge pull request #677 from turol/explicit-constructors
...
Mark single-parameter constructors explicit
2015-10-29 13:55:17 +01:00
46121a1559
Mark single-parameter constructors explicit
...
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
06b27e69c7
Merge pull request #676 from turol/master
...
Add a testcase for invalid OFF file
2015-10-28 21:20:49 +01:00
280641cee6
Add a testcase for invalid OFF file
...
Testcase generated by AFL which used to crash the OFF loader
2015-10-28 21:54:45 +02:00
f1279f8f45
Merge pull request #675 from turol/master
...
Fix OFFLoader to better handle certain malformed files
2015-10-28 20:10:20 +01:00
9825d07764
OFFLoader: Throw error on certain invalid files instead of failing validation later
2015-10-28 14:20:13 +02:00
7a5bc6eca3
OFFLoader: Use a temporary vector to store vertices instead of a raw array
...
Prevents crash on certain malformed inputs but
they still cause a validation failure.
2015-10-28 14:10:18 +02:00
fba7ede639
OFFLoader: Don't use assignments as expressions
2015-10-28 13:39:10 +02:00
12ed07a939
FBX import: If animation is not defining keys for all vector components
...
(x, y and z), use the node transform as the default value.
2015-10-27 21:03:24 +02:00
5160975138
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-27 19:48:36 +01:00
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
3274bcf8d6
Properly build path to the mtl file when loading loading obj
2015-10-25 20:04:50 +01:00
adb88aecde
Update Readme.md
...
Add link to webirc-client to join assetimporterlib channel on freenode.
2015-10-20 13:57:29 +02:00
282a913b7f
Merge pull request #670 from romeoxbm/master
...
Added support for reflection maps for OBJ files
2015-10-16 12:07:16 +02:00
2750f8da24
Added support for reflection maps for OBJ files
2015-10-15 15:46:35 +02:00
f489a7d076
Merge pull request #669 from Schebb/master
...
Fixed issue in PlyParser (uint16 values misparsed)
2015-10-12 20:57:17 +02:00
62ec784cef
Fixed issue in PlyParser (uint16 values misparsed)
2015-10-12 20:08:25 +02:00
eb01a1ebdf
Dummy edit to trigger CI.
2015-10-10 13:54:16 +02:00
878d0745d3
Merge pull request #640 from skyjake/md5-fix
...
MD5: Fix quaternion conversions
2015-10-10 13:53:27 +02:00
a1be9285b4
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-08 10:25:35 +02:00
1a1fd897b6
Updated regression test database for MD5 files
2015-10-07 17:02:48 +03:00
bfe3bee34b
Merge branch 'master' into md5-fix
2015-10-07 16:49:45 +03:00
1f113ca5ff
Merge pull request #666 from Lectem/patch-1
...
remove memory.h dependancy
2015-10-07 01:37:14 +02:00
Kim Kulling
Otger
Danke Xie
Kim Kulling
IOhannes m zmölnig
Dave Jarvis
Alexander Gessler
Turo Lamminen
Olli Kallioinen
Łukasz Twarduś
Francesco Guastella
Sebastien Bonopera
Jaakko Keränen