Commit Graph

  • 91a6ff7f0e Importer: fix doxygen comment style to default. Kim Kulling 2015-11-28 12:05:55 +01:00
  • ba35c97e9d assimp/assimp/issues/698: Increase upper limits for hints. Kim Kulling 2015-11-28 10:06:26 +01:00
  • 75f7d93434 Merge pull request #697 from otgerp/master Kim Kulling 2015-11-27 08:54:32 +01:00
  • 5942d60aea Fixed gcc errors Otger 2015-11-27 02:31:18 +01:00
  • 526027999b Merge Otger 2015-11-27 01:24:45 +01:00
  • b307ec643d Created exporter class and fixed a few bugs Otger 2015-11-27 01:16:48 +01:00
  • fc6f35dab2 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-11-26 20:53:41 +01:00
  • 502d9f17b6 glTF: add importer to registry and try to parse json. Kim Kulling 2015-11-26 20:49:00 +01:00
  • a655467b59 Merge pull request #692 from dankex/instance_image Kim Kulling 2015-11-26 14:06:09 +01:00
  • 398c1361d3 Merge pull request #674 from suikki/master Kim Kulling 2015-11-26 13:50:34 +01:00
  • 148a20a703 Experimental support for glTF Otger 2015-11-26 02:36:22 +01:00
  • 64a020965f Added RapidJSON to contrib Otger 2015-11-26 02:33:39 +01:00
  • 702ef1a513 glTF: add missing attribute buffer for text streams. Kim Kulling 2015-11-25 22:31:23 +01:00
  • db8845d2b2 glTF: add jsn reader + example model to work on. Kim Kulling 2015-11-25 22:03:39 +01:00
  • 65d366dad0 Merge pull request #694 from OtgerRP/master Kim Kulling 2015-11-24 21:26:34 +01:00
  • a51d9a3884 Ignore FBX 'PP' type connections (they were stopping the file parsing) Otger 2015-11-24 17:51:11 +01:00
  • 3c358a8e34 Updated dumps for FBX files Otger 2015-11-24 16:33:31 +01:00
  • 1daeef42ad Merge pull request #696 from yig/patch-1 Kim Kulling 2015-11-24 09:10:03 +01:00
  • da013350f9 aiGetExportFormatDescription() no longer uses free'd memory Yotam Gingold 2015-11-23 23:50:25 -05:00
  • c876dce82b Fixed crashes for Video with no content Otger 2015-11-23 21:46:55 +01:00
  • 032fbe3fe5 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-11-23 21:29:51 +01:00
  • 70540616ce issue 693: add missing release call in c-export interface. Kim Kulling 2015-11-23 21:28:35 +01:00
  • f94bc8d66e Initial support for FBX embedded textures Otger 2015-11-23 19:49:54 +01:00
  • 24b68b1e3d Support instance_image in Collada 1.5 files Danke Xie 2015-11-19 03:41:26 -08:00
  • 916cfb9d53 Merge pull request #690 from dankex/light Kim Kulling 2015-11-16 23:01:40 +01:00
  • 9721759da4 Merge pull request #691 from dankex/androidjni Kim Kulling 2015-11-16 13:40:44 +01:00
  • 57d7085fb8 Fix AndroidJNI header path in CMakelists.txt Danke Xie 2015-11-15 22:48:17 -08:00
  • 40ee575322 Add new light type 'ambient' to match light.h Danke Xie 2015-11-15 13:45:54 -08:00
  • 7cc90c106f Merge pull request #689 from umlaeute/debian-fixes-3.2 Kim Kulling 2015-11-15 09:59:23 +01:00
  • 7806e991d9 Convert Windows-1252 charset to UTF-8 IOhannes m zmölnig 2015-11-13 23:01:49 +01:00
  • 989e8af3fb fix argument check for assimp cmdline tool IOhannes m zmölnig 2015-11-13 22:33:53 +01:00
  • 756cfd4f74 fix compilation on BigEndian IOhannes m zmölnig 2015-11-13 22:33:20 +01:00
  • e6ac1ed66a glTF-Importer: add files. Kim Kulling 2015-11-08 20:29:05 +01:00
  • 02ad376631 assimp/issues/685: add test for correct usage. Kim Kulling 2015-11-07 10:00:55 +01:00
  • c318d648ff CMake: set version number to 3.2 v3.2 Kim Kulling 2015-11-03 19:47:37 +01:00
  • 655cb65ab2 Version: increase version from 3.1.1 to 3.2. Kim Kulling 2015-11-03 19:43:02 +01:00
  • 2fa797949b Update Readme.md Kim Kulling 2015-11-03 17:12:56 +01:00
  • 54c77e78b3 Update INSTALL Kim Kulling 2015-11-03 10:51:13 +01:00
  • 2997d4308f Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-11-02 21:09:54 +01:00
  • 0ea4682586 Collada Export test: fix unit test for lightsCollada Export test: fix unit test for lights.. Kim Kulling 2015-11-02 21:09:26 +01:00
  • 50b98faae6 Merge pull request #682 from DaveJarvis/patch-1 Kim Kulling 2015-11-02 21:05:55 +01:00
  • 97d5b1c822 Unix build instructions Dave Jarvis 2015-11-01 15:57:29 -08:00
  • c642d9f25e Collada exporter: fix access violation. Kim Kulling 2015-11-01 15:15:39 +01:00
  • 95c20cb5ab Collada exporter: fix invalid access to already release scene after reimporting exported scene. Kim Kulling 2015-11-01 13:48:55 +01:00
  • 6be8df5fde Boost::tuple: fix compiler-specifc test. Kim Kulling 2015-11-01 12:20:35 +01:00
  • eadc6116c0 OpenDDLParser: latest greatest. Kim Kulling 2015-10-31 09:43:34 +01:00
  • 6f75ea5702 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-10-31 09:07:21 +01:00
  • 4fb7e3a779 Merge pull request #677 from turol/explicit-constructors Alexander Gessler 2015-10-29 13:55:17 +01:00
  • 46121a1559 Mark single-parameter constructors explicit Turo Lamminen 2015-10-29 14:04:23 +02:00
  • 06b27e69c7 Merge pull request #676 from turol/master Alexander Gessler 2015-10-28 21:20:49 +01:00
  • 280641cee6 Add a testcase for invalid OFF file Turo Lamminen 2015-10-28 14:55:21 +02:00
  • f1279f8f45 Merge pull request #675 from turol/master Kim Kulling 2015-10-28 20:10:20 +01:00
  • 9825d07764 OFFLoader: Throw error on certain invalid files instead of failing validation later Turo Lamminen 2015-10-28 14:20:13 +02:00
  • 7a5bc6eca3 OFFLoader: Use a temporary vector to store vertices instead of a raw array Turo Lamminen 2015-10-28 14:10:18 +02:00
  • fba7ede639 OFFLoader: Don't use assignments as expressions Turo Lamminen 2015-10-28 13:30:56 +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. Olli Kallioinen 2015-10-27 21:03:24 +02:00
  • 5160975138 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-10-27 19:48:36 +01:00
  • 1b3381d03d Merge pull request #672 from Ang3lus/Fix-mtl-realtive-path Alexander Gessler 2015-10-25 20:26:49 +01:00
  • 3274bcf8d6 Properly build path to the mtl file when loading loading obj Łukasz Twarduś 2015-10-19 22:07:32 +02:00
  • 6bbec8d96e Merge pull request #9 from assimp/master Madrich 2015-10-24 14:01:02 +02:00
  • adb88aecde Update Readme.md Kim Kulling 2015-10-20 13:57:29 +02:00
  • 282a913b7f Merge pull request #670 from romeoxbm/master Alexander Gessler 2015-10-16 12:07:16 +02:00
  • 2750f8da24 Added support for reflection maps for OBJ files Francesco Guastella 2015-10-15 15:46:35 +02:00
  • f489a7d076 Merge pull request #669 from Schebb/master Alexander Gessler 2015-10-12 20:57:17 +02:00
  • 62ec784cef Fixed issue in PlyParser (uint16 values misparsed) Sebastien Bonopera 2015-10-12 20:08:25 +02:00
  • eb01a1ebdf Dummy edit to trigger CI. Alexander Gessler 2015-10-10 13:54:16 +02:00
  • 878d0745d3 Merge pull request #640 from skyjake/md5-fix Alexander Gessler 2015-10-10 13:53:27 +02:00
  • a1be9285b4 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-10-08 10:25:35 +02:00
  • 1a1fd897b6 Updated regression test database for MD5 files Jaakko Keränen 2015-10-07 17:02:48 +03:00
  • bfe3bee34b Merge branch 'master' into md5-fix Jaakko Keränen 2015-10-07 16:49:45 +03:00
  • 1f113ca5ff Merge pull request #666 from Lectem/patch-1 Alexander Gessler 2015-10-07 01:37:14 +02:00
  • 5778b7ed9a Merge pull request #668 from assimp/acgessler-patch-3 Alexander Gessler 2015-10-06 19:56:19 +02:00
  • b5be5a64f7 Let appveyor decide on OS version, hopefully fixes appveyor failure. Alexander Gessler 2015-10-06 17:51:23 +02:00
  • 709f19e5ab Merge pull request #664 from Tcll/master Alexander Gessler 2015-10-04 16:59:24 +02:00
  • e7fa8fa8ae OpenDDLParser: add missing files. Kim Kulling 2015-10-02 00:38:50 +02:00
  • 4a8b459706 OpenDDLParser: latest greatest. Kim Kulling 2015-10-01 20:29:15 +02:00
  • 6f0bc9bcb2 remove memory.h dependancy Lectem 2015-09-30 09:16:18 -04:00
  • c65d2dc05c Merge pull request #659 from Loftilus/master Alexander Gessler 2015-09-28 23:15:55 +01:00
  • 5ce968c67f Added auto-detection of numpy Tcll 2015-09-28 14:18:22 -04:00
  • 2e725c0dc5 Added auto-detection of numpy Tcll 2015-09-28 14:15:06 -04:00
  • 7ed32fd5a9 fix typo. Kim Kulling 2015-09-27 20:49:15 +02:00
  • 1fbc0cc276 DefaultIOSystem: fix typo in macro. Kim Kulling 2015-09-27 10:51:33 +02:00
  • f5c8f7b5e5 DefaultIOSystem: close cygwin issue assimp/assimp/issues/660. Kim Kulling 2015-09-27 01:02:12 +02:00
  • d06945f17e DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32 as well. Kim Kulling 2015-09-24 23:51:04 +02:00
  • 3fc251b326 BaseImporter: fix typo and rename attributes for better readability. Kim Kulling 2015-09-24 00:57:47 +02:00
  • ef6baa0acf DefaultIOSystem: use correct define to detect Visual Studi compiler. Kim Kulling 2015-09-22 00:23:33 +02:00
  • 34ee4c4b9a DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to detect vs-compiler. Kim Kulling 2015-09-21 20:43:58 +02:00
  • 6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-09-21 17:34:01 +02:00
  • ca6296f609 STLLoader: mak functions local. Kim Kulling 2015-09-21 17:33:41 +02:00
  • f2c2bc6945 CMake: add windows 8.1 search path for DirectX SDK, closes assimp/assimp/issues/631 Kim Kulling 2015-09-21 17:31:27 +02:00
  • 367c9980b2 Add Boost 1.59 Håvard Mathisen 2015-09-20 17:15:01 +02:00
  • e159728307 Update Readme.md Kim Kulling 2015-09-15 08:55:40 +02:00
  • bd6a069fa8 Merge pull request #651 from abma/master Kim Kulling 2015-09-10 18:15:47 +02:00
  • d1e21045dc Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2015-09-07 11:49:41 +02:00
  • ba37e362e8 Sample: fix https://github.com/assimp/assimp/issues/113, remove deprecated makefile. Kim Kulling 2015-09-04 17:10:51 +02:00
  • a58d0f57b3 Merge pull request #8 from assimp/master Madrich 2015-09-04 13:08:28 +02:00
  • d49e47c25c fix #431 abma 2015-09-02 10:04:28 +02:00
  • fff2c4141e fix #634 abma 2015-09-02 09:56:58 +02:00
  • e9937ab0f7 IOSystem: add missing documentation. Kim Kulling 2015-08-30 15:37:56 +02:00
  • e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 Kim Kulling 2015-08-30 15:21:53 +02:00