Commit Graph

  • badd8cb6a4 OpenGEX: fix lowercase typo for linux. Kim Kulling 2017-05-19 23:00:57 +02:00
  • 4e1ea6ecd7 docs: Explain texture paths for embedded textures Squareys 2017-05-19 13:31:20 +02:00
  • efeeb6a827 docs: Update logging docs Squareys 2017-05-19 13:30:48 +02:00
  • aab36ca723 docs: Update copyright notice in preamble Squareys 2017-05-19 13:30:11 +02:00
  • febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev Kim Kulling 2017-05-17 12:01:46 +02:00
  • eba06f0c8b Merge pull request #1275 from ab4d/master Kim Kulling 2017-05-17 11:34:35 +02:00
  • 1daad40b30 Merge branch 'master' into issue-1262 Kim Kulling 2017-05-17 10:20:45 +02:00
  • 04f908aa4c Obj-Exporter: fix build. Kim Kulling 2017-05-17 10:13:07 +02:00
  • 60c54cbf59 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-05-17 09:25:30 +02:00
  • 2f649833d5 LWOLoader: fix link in loader description. Kim Kulling 2017-05-17 09:25:07 +02:00
  • 331bbacf3d Fixed build error in ObjExporter :: GetMaterialLibFileName Andrej 2017-05-16 22:18:47 +02:00
  • 2b785e4e81 Merge pull request #1274 from ab4d/master Kim Kulling 2017-05-16 22:09:59 +02:00
  • 2b89a3cffc Using single quote for one character parameter in find_last_of method call Andrej 2017-05-16 21:56:49 +02:00
  • 3f68278ea0 Merge branch 'master' into issue-1262 Kim Kulling 2017-05-16 21:53:35 +02:00
  • 6c70edaf28 build: add missing files. Kim Kulling 2017-05-16 21:46:04 +02:00
  • a45b5cdfb5 OpenGEX: fix invalid handling with color4 token. Kim Kulling 2017-05-16 21:45:23 +02:00
  • 542fe31a94 closes https://github.com/assimp/assimp/issues/1262: fix . Kim Kulling 2017-05-16 21:07:20 +02:00
  • c3974512e4 Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl Andrej 2017-05-16 15:55:40 +02:00
  • 04dbdca329 Revert "Creating fileName.mtl file instead of fileName.obj.mtl" Andrej 2017-05-16 15:47:57 +02:00
  • 5757980ea5 Creating fileName.mtl file instead of fileName.obj.mtl Andrej 2017-05-16 15:34:50 +02:00
  • ff7624f06f Merge pull request #1268 from VennGrayDog/b1 Kim Kulling 2017-05-15 21:37:26 +02:00
  • 7e011c92f0 Merge pull request #1269 from assimp/issue_1266 Kim Kulling 2017-05-15 21:33:42 +02:00
  • 0c3a145729 issue-1266: add unittest for it. Kim Kulling 2017-05-15 21:18:34 +02:00
  • 428a4cdd71 SpatialSort: use std::vector::clear(). Kim Kulling 2017-05-15 19:41:08 +02:00
  • e5657bf0c5 closes https://github.com/assimp/assimp/issues/1266: fix wrong delete Kim Kulling 2017-05-15 09:55:39 +02:00
  • ab45dc79fa Merge pull request #1263 from jamesgk/gltf-export Alexander Gessler 2017-05-15 09:12:57 +02:00
  • 0b34089df0 Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files. VennGrayDog 2017-05-15 02:27:14 -04:00
  • 24790398b9 Merge pull request #1264 from smokris/master Alexander Gessler 2017-05-15 00:39:36 +02:00
  • cd7cc2e58c Merge pull request #1267 from VennGrayDog/b1 Alexander Gessler 2017-05-15 00:39:05 +02:00
  • 3d05df2d3e Fix location of config.h VennGrayDog 2017-05-13 14:09:21 -04:00
  • 2e455b78c8 Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'. Steve Mokris 2017-05-11 15:21:37 -04:00
  • c33039d682 GLTF exporter: convert animation time from ticks to seconds jamesgk 2017-05-11 11:04:23 -07:00
  • 9b2671b280 Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue Kim Kulling 2017-05-11 10:55:59 +02:00
  • ab19c5e3f7 Merge pull request #1258 from jamesgk/gltf-export Kim Kulling 2017-05-11 10:46:06 +02:00
  • aa26cfab6d Merge branch 'master' into coverity_scan Kim Kulling 2017-05-10 19:49:30 +02:00
  • f6a8be5bac AMPImporter: fix coverity findings. Kim Kulling 2017-05-10 19:34:50 +02:00
  • 5411f769e8 STEPFile: fix coverity findings. Kim Kulling 2017-05-10 18:50:51 +02:00
  • d36fbfbb8b Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-05-10 18:30:36 +02:00
  • 0300574b8b AMFImporter: fix coverity findings. Kim Kulling 2017-05-10 18:29:42 +02:00
  • b8747fffca Merge pull request #1259 from Squareys/fix-cmake-install Kim Kulling 2017-05-10 09:37:04 +02:00
  • 9ef1a4fae0 X3D: fix coverity findings. Kim Kulling 2017-05-09 22:54:04 +02:00
  • cfb867b5e7 Fix config.h not being found during install Squareys 2017-05-09 21:51:49 +02:00
  • eb828a3b71 X3DImporter: fix coverity findings. Kim Kulling 2017-05-09 21:35:21 +02:00
  • 4a5c483ac4 AMFImporter: make test against nullptr dereferencing meaningful. Kim Kulling 2017-05-09 21:03:20 +02:00
  • f77e27ca19 ColladaExporter: remove self assignment. Kim Kulling 2017-05-09 20:59:01 +02:00
  • 03d97b23ec Coverity: fix finding in COBLoader. Kim Kulling 2017-05-09 20:15:30 +02:00
  • a2b8d66a86 Update license info. Kim Kulling 2017-05-09 19:57:36 +02:00
  • 36f4fb8826 GLTF exporter: ensure animation accessors have same count jamesgk 2017-05-05 16:45:28 -07:00
  • 186629b372 SpatialSort: use std::vector::resize( 0 ) to improve readability. Kim Kulling 2017-05-08 21:57:08 +02:00
  • 65653edf88 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-05-08 21:29:07 +02:00
  • 5289954e27 Fix review findings. Kim Kulling 2017-05-06 20:57:17 +02:00
  • 98100d8cab Blender-Importer: fix coverity findings. Kim Kulling 2017-05-06 11:14:04 +02:00
  • d02a4c36a9 Mesh: fix coverity finding. Kim Kulling 2017-05-06 11:08:57 +02:00
  • c1b56715fe Mesh: fix coverity bug. Kim Kulling 2017-05-06 11:04:40 +02:00
  • 39e048dea6 Merge pull request #1254 from samitc/master Kim Kulling 2017-05-04 19:53:51 +02:00
  • 7f014ea889 Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri Kim Kulling 2017-05-04 19:52:18 +02:00
  • d6e8fd34f0 Search for .gltf extension at end of file name for buffer prefix. John Senneker 2017-05-03 15:11:31 -04:00
  • 82e213fb7c Merge pull request #1252 from a-day-old-bagel/master Kim Kulling 2017-05-02 20:07:08 +02:00
  • e21c1a8ec4 Merge pull request #1255 from heliocastro/fpic_fix Kim Kulling 2017-05-02 20:06:08 +02:00
  • 0c4c1270ac Add missing CFLAGS -fPIC. This entry was missing due revert of CMAKE_POSITION_INDEPENDENT_CODE usage. Reported by @Sailsman63 Helio Chissini de Castro 2017-05-02 16:45:37 +02:00
  • b93df233e3 Merge pull request #1253 from rdb/master Kim Kulling 2017-05-02 11:03:59 +02:00
  • dd1d10407e make array non static to support multithreaded Amit Cirt 2017-05-01 16:54:07 +03:00
  • 8b4e066ca5 Improve performance of obj line break Amit Cirt 2017-05-01 16:32:49 +03:00
  • 0069552183 Fix static init ordering bug in OpenGEX importer rdb 2017-05-01 15:11:22 +02:00
  • 3f361ecc1f Merge pull request #1247 from rspencer01/master Kim Kulling 2017-05-01 10:56:34 +02:00
  • 678fc45100 Merge pull request #1250 from heliocastro/irrxml Kim Kulling 2017-05-01 10:56:00 +02:00
  • 3e5e3a54b9 Merge branch 'master' of https://github.com/assimp/assimp Galen Cochrane 2017-04-29 15:10:35 -06:00
  • 6f00ca558d Group libstdc++ entry in the compiler optionas as well Helio Chissini de Castro 2017-04-29 08:44:58 +02:00
  • 4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal Helio Chissini de Castro 2017-04-27 17:19:51 +02:00
  • 79e582abca Update Readme.md Kim Kulling 2017-04-28 19:30:21 +02:00
  • 8218586d6d Update Readme.md Kim Kulling 2017-04-27 16:59:33 +02:00
  • aff391c681 Fixed no member named 'atop' in global namespace issue for Android NDK compilation Cong Jie 2017-04-27 17:15:03 +09:00
  • c264df50f3 Merge pull request #1246 from heliocastro/fix_docinstall Kim Kulling 2017-04-26 20:33:13 +02:00
  • 28da8c643d Adds texture type enum to pyassimp Robert Spencer 2017-04-26 15:05:45 +02:00
  • 1ba843118b - Fix documentation install process. It's nonsense second BUILD_DOCS check on doc/CMakeLists since is already checked on main CMakeLists. At same time, Doxygen becomes required as no documentation can be built without it. Output directory now uses the user defined HTML_OUTPUT instead of forced dir. - Added included GNUInstallDirs on same UNIX check, avoiding duplication of checks Helio Chissini de Castro 2017-04-25 14:35:07 +02:00
  • b30c6282f7 Merge pull request #1239 from tgnottingham/master Kim Kulling 2017-04-22 14:22:29 +02:00
  • 8445db2cd9 Set UVW index material properties for OBJ files. Tyson Grant Nottingham 2017-04-21 01:09:26 -07:00
  • f60f1544f7 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-04-19 19:57:56 +02:00
  • 1a8b23712e Unittests: add validation for TestIOSystem parameters. Kim Kulling 2017-04-19 19:57:20 +02:00
  • 4c348a6cdc Merge pull request #1234 from heliocastro/html_output Kim Kulling 2017-04-18 17:11:41 +02:00
  • e4f05064df Enable doxygen been properly used from cmake build and install. Helio Chissini de Castro 2017-04-18 14:51:17 +02:00
  • c1d1dfadb3 Unittests: prepare ctest usage. Kim Kulling 2017-04-17 21:25:57 +02:00
  • ad80f97930 closes github.com/assimp/assimp/issues/1228: use test extension for exported test files. Kim Kulling 2017-04-17 14:26:54 +02:00
  • babb783336 Unittest: add missing test for ply-parser. Kim Kulling 2017-04-17 14:15:33 +02:00
  • 24f585b9aa Merge pull request #1232 from asmaloney/fix-spelling Kim Kulling 2017-04-12 13:24:55 +02:00
  • b64882f4c7 Fix spelling Andy Maloney 2017-04-11 16:33:13 -04:00
  • cfe4ee0202 Merge pull request #1231 from samitc/master Kim Kulling 2017-04-11 19:14:00 +02:00
  • 9fc7f72b55 fix line breakes in obj files Amit Cirt 2017-04-11 17:16:18 +03:00
  • 93b710c2aa Merge pull request #1226 from gbittoun/master Kim Kulling 2017-04-09 10:57:50 +02:00
  • 0e3956caf1 Compilation fix: Removing the vector4 headers from code/CMakeLists.txt Guillaume Bittoun 2017-04-08 23:25:39 +02:00
  • 910e0ddc5a Adding a fallback to shader version 120 when version 130 failed to compile Guillaume Bittoun 2017-04-08 12:05:54 +02:00
  • 33bd5cfcfb Installing assimp library as well Guillaume Bittoun 2017-04-08 11:16:28 +02:00
  • 2825d2daf8 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-04-07 17:50:20 +02:00
  • fac2f4d2f2 add missing doc. Kim Kulling 2017-04-07 17:50:13 +02:00
  • 53af3a5f95 add missing doc. Kim Kulling 2017-04-07 17:49:59 +02:00
  • 74b89e13f6 add missing doc. Kim Kulling 2017-04-07 17:49:43 +02:00
  • 0c43688108 add doc. Kim Kulling 2017-04-07 17:49:26 +02:00
  • c4b5dc4275 add missing image. Kim Kulling 2017-04-07 17:49:03 +02:00
  • 0fc5c9417c export doc.# with '#' will be ignored, and an empty message aborts the commit. Kim Kulling 2017-04-07 17:48:18 +02:00
  • 38fab5ae8e doc updatedoc update Kim Kulling 2017-04-07 17:46:53 +02:00