Commit Graph

  • f0ffcd4025 Merge branch 'master' into issue_2390 Kim Kulling 2019-03-28 20:28:28 +01:00
  • f653c48c23 Merge branch 'master' into fix-miniz-bug Kim Kulling 2019-03-27 20:19:06 +01:00
  • deceb4ebf4 Merge pull request #2387 from assimp/stepfile_fixes Kim Kulling 2019-03-27 20:18:36 +01:00
  • 4efa3736ba Actually fix cmake this time Charlie Gettys 2019-03-27 12:03:39 -04:00
  • d718793163 Fix change to CMakeLists.txt Charlie Gettys 2019-03-27 11:43:21 -04:00
  • 769dd42b73 Add compile definition to fix issue Charlie Gettys 2019-03-27 11:29:40 -04:00
  • ab92f50fa8 Add upstreamed change to miniz.h Charlie Gettys 2019-03-27 11:28:37 -04:00
  • ca08c4a209 FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390) Matias 2019-03-27 11:20:16 +01:00
  • bb11f90983 Update zip library to current head. Closes assimp/assimp#2388 Charlie Gettys 2019-03-26 22:45:20 -04:00
  • 7e39ae0d52 Stepfile: fix some minor review finding. Kim Kulling 2019-03-26 20:19:16 +01:00
  • a43ac5b3fd Merge pull request #2382 from asmaloney/fix_zlib_AMD64 Kim Kulling 2019-03-25 14:16:11 +01:00
  • 6c26268035 {cmake} Explicitly turn off ASM686 and AMD64 cmake options when ASSIMP_BUILD_ZLIB is on Andy Maloney 2019-03-19 17:33:00 -04:00
  • f8753482d3 Merge pull request #2386 from assimp/kimkulling-dev-1 Kim Kulling 2019-03-24 15:23:40 +01:00
  • 0fc58c135b Update Readme.md Kim Kulling 2019-03-24 13:01:38 +01:00
  • e3bd33f0c8 Merge pull request #2380 from devnoname120/patch-1 Kim Kulling 2019-03-21 17:10:33 +01:00
  • 0abf6acf86 Merge branch 'master' into patch-1 Kim Kulling 2019-03-18 23:06:03 +01:00
  • 8d5551a422 Merge pull request #2379 from asmaloney/select_exporters Kim Kulling 2019-03-18 20:53:51 +01:00
  • cd9c256de5 INSTALL: update bullet point numbers devnoname120 2019-03-18 14:28:27 +01:00
  • 82e08d2a92 INSTALL: Out of source build and improve Windows devnoname120 2019-03-18 14:27:29 +01:00
  • 22f4667932 Merge branch 'master' into select_exporters Kim Kulling 2019-03-17 23:44:35 +01:00
  • e899067f44 Merge pull request #2371 from assimp/fix_vs107_warnings Kim Kulling 2019-03-17 09:26:36 +01:00
  • 718b5b266b Merge branch 'master' into fix_vs107_warnings Kim Kulling 2019-03-16 18:41:54 +01:00
  • 525566b8b8 try to fix shared object issue. Kim Kulling 2019-03-16 18:36:26 +01:00
  • c1e2f19c08 Merge branch 'issue_1650' of https://github.com/assimp/assimp into issue_1650 Kim Kulling 2019-03-16 17:03:02 +01:00
  • a3fdb46f67 fix typo. Kim Kulling 2019-03-16 17:02:38 +01:00
  • df6d257633 Fix 3MF importer Andy Maloney 2019-03-16 11:55:16 -04:00
  • 5ccd7d8c39 Adds a way to select which exporters you want to compile Andy Maloney 2019-03-16 11:40:17 -04:00
  • 581d06a7b7 Merge branch 'master' into issue_1650 Kim Kulling 2019-03-16 16:22:47 +01:00
  • 2f6aa2460a Merge pull request #2376 from ucpu/master Kim Kulling 2019-03-16 16:22:21 +01:00
  • 64bcf56101 Merge branch 'master' into issue_1650 Kim Kulling 2019-03-16 16:13:52 +01:00
  • f4ec02a34b Fix install folders for cmake - os files. Kim Kulling 2019-03-16 16:10:30 +01:00
  • a0c797a29e Merge branch 'master' into fix_vs107_warnings Kim Kulling 2019-03-16 16:09:14 +01:00
  • 64a7a46406 Update MD3Loader.cpp Kim Kulling 2019-03-16 16:08:03 +01:00
  • e9b6a4895d Fix the build. Kim Kulling 2019-03-16 15:32:47 +01:00
  • ba6a7383b2 closes https://github.com/assimp/assimp/issues/1650: build irrXml as shared lib. Kim Kulling 2019-03-16 09:45:21 +01:00
  • 9a533d826a fix loading 3D uvs from obj Tomas Maly 2019-03-15 22:43:12 +01:00
  • 07bbb2c000 Nicer name for Assimp Binary importer Rich ard 2019-03-15 10:18:43 +00:00
  • ef270225ac Merge pull request #2372 from Aidmx/master Kim Kulling 2019-03-15 08:03:58 +01:00
  • 61ffe017e8 Fix some coverity findings. kimkulling 2019-03-14 17:37:28 +01:00
  • 170549559e fix: change ScaleProcess priority Aidmx 2019-03-14 21:50:50 +08:00
  • d9e81cbfd1 Merge pull request #2370 from assimp/issue_934 Kim Kulling 2019-03-14 00:05:39 +01:00
  • 04025f09cf Merge branch 'master' into issue_934 Kim Kulling 2019-03-13 22:27:23 +01:00
  • 93e8a1054f Add short documentation. Kim Kulling 2019-03-13 22:07:03 +01:00
  • 27f3b35813 Merge pull request #2366 from Cgettys/master Kim Kulling 2019-03-13 21:35:14 +01:00
  • 145c3d1589 add missing changes. Kim Kulling 2019-03-13 19:35:36 +01:00
  • 0a731a0bff closes https://github.com/assimp/assimp/issues/934: introduce material keys for shader types. Kim Kulling 2019-03-13 19:32:13 +01:00
  • 650fadebe9 Fix compiler warnings: var declarations hides other var. kkulling 2019-03-13 16:58:18 +01:00
  • 0dc2e9197a Fix compiler warnings. kkulling 2019-03-13 14:40:02 +01:00
  • 90dbd8f350 Merge branch 'master' into master Kim Kulling 2019-03-13 08:40:34 +01:00
  • 152cddedd3 Merge pull request #2369 from assimp/kimkulling-dev-1 Kim Kulling 2019-03-13 00:21:11 +01:00
  • 63afcf8267 Update appveyor.yml Kim Kulling 2019-03-12 21:56:28 +01:00
  • ac80b116a9 Update appveyor.yml Kim Kulling 2019-03-12 21:42:32 +01:00
  • f0ed1702b9 Reenable vs2015 and vs1017 Kim Kulling 2019-03-12 20:49:14 +01:00
  • 5fd9789fc3 remove last warning? Charlie Gettys 2019-03-12 02:51:37 -04:00
  • 4728c1bb68 remove 1 more of the warnings Charlie Gettys 2019-03-12 02:49:33 -04:00
  • 27dc922d09 Hopefully fix all warnings? Charlie Gettys 2019-03-12 01:06:54 -04:00
  • 28c110af2e Initial pass Charlie Gettys 2019-03-10 13:15:15 -04:00
  • 7bb1303773 ValidateDataStructure.cpp: * Fixed warnings introduced by last commit (hopefully) * Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning) * Minor formatting consistency improvements Charlie Gettys 2019-03-10 13:12:56 -04:00
  • 5c900d689a Merge pull request #2365 from assimp/kimkulling-dev-1 v.5.0.0.rc1 Kim Kulling 2019-03-10 12:05:27 +01:00
  • 925ac6b372 Typo Kim Kulling 2019-03-10 11:17:52 +01:00
  • 2e262dbbc6 Make syntax used to call ReportError & ReportWarning a bit more consistent Charlie Gettys 2019-03-09 12:36:21 -05:00
  • 80dffb63e8 Add aiNode::mName to ValidateDataStructure error reporting to ease debugging Charlie Gettys 2019-03-09 12:01:45 -05:00
  • 3a610d3d66 Embed version information under Windows Rich ard 2019-03-08 15:49:18 +00:00
  • b15c93c726 Merge https://github.com/assimp/assimp Marco Di Benedetto 2019-03-07 14:35:41 +01:00
  • c3c0f5028c Merge branch 'master' into ETC_Inc Rich ard 2019-03-05 12:27:37 +00:00
  • 762c09988c Merge pull request #1 from assimp/master RichardTea 2019-03-05 12:25:42 +00:00
  • 7d7574f189 Merge branch 'master' into ETC_Inc RichardTea 2019-03-05 12:07:10 +00:00
  • e00d92ea84 Merge pull request #2354 from asmaloney/include_fix Kim Kulling 2019-03-03 20:08:43 +01:00
  • f75c39593c Merge branch 'master' into include_fix Kim Kulling 2019-03-02 09:16:09 +01:00
  • b7906bcce9 Merge pull request #2353 from phr34k/fix-bug-autogenerated-names Kim Kulling 2019-03-02 09:08:49 +01:00
  • b9c8e0856f Merge branch 'master' into fix-bug-autogenerated-names Kim Kulling 2019-03-01 20:24:45 +01:00
  • 99c3697d12 Ensure our include directories get added in the correct order Andy Maloney 2019-03-01 12:38:59 -05:00
  • e9eda062a1 In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional useColladaName setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master. Lawrence Kok 2019-03-01 10:43:18 +07:00
  • a23aa70575 Merge pull request #2350 from appsforlife/issue-2349 Kim Kulling 2019-02-27 18:50:42 +01:00
  • 7b01ff6b8d ignoring invalid normals and uvs indices instead of canceling the import completely Vitaly Ovchinnikov 2019-02-27 12:15:03 +13:00
  • d5a0a21f8c Merge pull request #2348 from assimp/simple_skin_test Kim Kulling 2019-02-26 00:20:09 +01:00
  • 262bbc0d5e fix compiler warnings. Kim Kulling 2019-02-25 23:19:21 +01:00
  • 16080ba60c Merge branch 'master' into simple_skin_test Kim Kulling 2019-02-25 22:06:56 +01:00
  • 206004c7d6 introduce simple skin-test +some findings. Kim Kulling 2019-02-25 22:06:24 +01:00
  • c1c42023fa Merge branch 'master' into ETC_Inc RichardTea 2019-02-20 16:58:41 +00:00
  • bc0064d3b0 Merge pull request #2345 from assimp/issue_1593 Kim Kulling 2019-02-20 00:33:02 +01:00
  • f59f3976c0 closes https://github.com/assimp/assimp/issues/1593: fix computation of percentf for 3DS. Kim Kulling 2019-02-20 00:02:19 +01:00
  • 873f77a48d Merge pull request #2344 from assimp/issue_2115 Kim Kulling 2019-02-19 21:02:21 +01:00
  • adbc7e8f70 closes https://github.com/assimp/assimp/issues/2115: rollback setup of FBX-camera. Kim Kulling 2019-02-19 20:23:20 +01:00
  • cc8f91c24d Merge pull request #2341 from BoneCrasher/issue_2340 Kim Kulling 2019-02-19 14:31:29 +01:00
  • 050430cae0 Merge branch 'master' into issue_2340 Kim Kulling 2019-02-19 13:14:59 +01:00
  • ef35acc7db Merge pull request #2342 from assimp/isue_305 Kim Kulling 2019-02-19 13:14:28 +01:00
  • ebf9deb6e0 Update appveyor.yml Kim Kulling 2019-02-19 11:28:15 +01:00
  • b0f94c4620 Update appveyor.yml Kim Kulling 2019-02-19 11:19:53 +01:00
  • ea2e6936e5 Add test file. Kim Kulling 2019-02-18 21:44:07 +01:00
  • ae41ae3211 closes https://github.com/assimp/assimp/issues/305': fix viewer Kim Kulling 2019-02-18 21:43:45 +01:00
  • 4d0740a120 [Issue_2340] Proper closing endif()... Marc-Anton Boehm-von Thenen 2019-02-18 14:15:39 +01:00
  • a94c8bf3f6 [Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation Marc-Anton Boehm-von Thenen 2019-02-18 14:14:27 +01:00
  • c3129e55d2 [Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment Marc-Anton Boehm-von Thenen 2019-02-18 14:10:32 +01:00
  • 0810b2d51b Merge branch 'master' into ETC_Inc Kim Kulling 2019-02-15 10:20:30 +01:00
  • fadfaf88db Merge pull request #2326 from MalcolmTyrrell/topic/Bug2034_typeCodeC Kim Kulling 2019-02-08 20:38:07 +01:00
  • 4621bde985 Merge branch 'master' into topic/Bug2034_typeCodeC Kim Kulling 2019-02-08 14:38:25 +01:00
  • 2f69e4945c Merge pull request #2330 from assimp/kimkulling-dev-1 Kim Kulling 2019-02-08 14:38:11 +01:00
  • 6cc41d6be6 Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2019-02-07 19:27:07 +01:00
  • 54c5f3f2d0 Update README Kim Kulling 2019-02-07 19:22:47 +01:00