Commit Graph

  • a01d7c4048 Merge pull request #2820 from RichardTea/collada_modeller_metadata Kim Kulling 2020-01-02 20:40:41 +01:00
  • ae7a0aa6ef Merge branch 'master' into collada_modeller_metadata RichardTea 2020-01-02 13:25:04 +00:00
  • 4e50b05b85 Fix off-by-one error RichardTea 2020-01-02 13:24:50 +00:00
  • ab50b5e181 Fix typo, fix GCC build RichardTea 2020-01-02 13:02:40 +00:00
  • d11af753f2 Fix Codacity warnings, test Exporter metadata RichardTea 2020-01-02 12:35:00 +00:00
  • 6bdda42cd0 Merge branch 'master' into fix/collada-combining-animations Kim Kulling 2020-01-02 00:40:03 +01:00
  • 2620f4a536 Merge pull request #2858 from malortie/uv-coordinates-swapped-twice Kim Kulling 2020-01-01 14:03:52 +01:00
  • 1d8e854ba3 Merge branch 'master' into uv-coordinates-swapped-twice Marc-Antoine Lortie 2019-12-30 08:37:43 -05:00
  • 6de5ff8f7d Fixed UV coordinate swapped twice in big endian. Marc-Antoine Lortie 2019-12-30 08:30:34 -05:00
  • 5ce373c312 Don't combine Collada animations when channels are shared Felipeek 2019-12-29 16:05:33 -03:00
  • 45601a49f7 Merge pull request #3 from assimp/master Tomas Mariancik 2019-12-28 16:45:08 +01:00
  • 58647c8c2e Merge pull request #2853 from yunqiangshanbill/gltf-import-bug-fix Kim Kulling 2019-12-28 09:08:34 +01:00
  • c9d9f2077d Merge branch 'master' into gltf-import-bug-fix Kim Kulling 2019-12-27 16:35:09 +01:00
  • 04f7c5b67a Merge pull request #2838 from malortie/hl1-mdl-loader Kim Kulling 2019-12-27 10:32:05 +01:00
  • d2ed36756c fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed. bill.shan 2019-12-27 11:21:05 +08:00
  • ab4166a279 Merge pull request #1 from assimp/master yunqiangshanbill 2019-12-26 18:59:39 +08:00
  • 2026d52df4 Improved comments in HL1MDLFile.h Marc-Antoine Lortie 2019-12-25 12:57:48 -05:00
  • 7e957768db Removed dead code. Marc-Antoine Lortie 2019-12-25 08:13:20 -05:00
  • 1e29329a84 Merge branch 'master' into hl1-mdl-loader Kim Kulling 2019-12-25 10:13:42 +01:00
  • 70f793f52e Merge pull request #2843 from 9739654/patch-1 Kim Kulling 2019-12-24 08:13:55 +01:00
  • 97bc855e80 Merge branch 'master' into patch-1 Kim Kulling 2019-12-23 23:27:21 +01:00
  • b9ac4c3fda Merge pull request #2825 from bztsrc/master Kim Kulling 2019-12-23 23:26:52 +01:00
  • ae92a34d91 Update SMDLoader.cpp Mateusz Paluch 2019-12-22 09:57:02 +01:00
  • 79aeb65ab4 Merge branch 'master' into master Kim Kulling 2019-12-22 09:18:02 +01:00
  • 66750588cf Merge pull request #2839 from apanteleev/vcruntime-fix Kim Kulling 2019-12-22 09:17:29 +01:00
  • 4050f7601f Merge branch 'master' into hl1-mdl-loader Marc-Antoine Lortie 2019-12-19 09:47:19 -05:00
  • e350650a93 Merge branch 'master' into vcruntime-fix Kim Kulling 2019-12-19 14:26:26 +01:00
  • 9f196f7d02 Merge pull request #2813 from umlaeute/python-fixes Kim Kulling 2019-12-19 14:25:51 +01:00
  • ce11ae2ec8 Merge branch 'master' into python-fixes Kim Kulling 2019-12-19 10:41:00 +01:00
  • 49839796e6 Merge pull request #2841 from MalcolmTyrrell/fixTypos Kim Kulling 2019-12-18 20:18:16 +01:00
  • 6a3f2e89f3 Merge branch 'master' into hl1-mdl-loader Marc-Antoine Lortie 2019-12-18 12:40:59 -05:00
  • 3b7e2bc3fa Fix typos Malcolm Tyrrell 2019-12-18 16:13:23 +00:00
  • 607243448f Fixed int/unsigned int comparaisons. Marc-Antoine Lortie 2019-12-18 08:33:41 -05:00
  • 5d79639a8a Removed unused variable. Marc-Antoine Lortie 2019-12-18 08:10:12 -05:00
  • 87de50e1f3 Added missing parentheses around assignment in while condition. Marc-Antoine Lortie 2019-12-18 07:51:45 -05:00
  • 02c2bfa2b8 Added missing member initializations. Marc-Antoine Lortie 2019-12-18 07:35:30 -05:00
  • 7c2cec2182 Fixed member initialization order. Marc-Antoine Lortie 2019-12-18 07:28:52 -05:00
  • 03a17f87fa Made the CMake config more submodule friendly. Alexey Panteleev 2019-12-17 17:51:23 -08:00
  • 03e6e0c69e Merge pull request #2776 from dylankenneally/warning-level-max Kim Kulling 2019-12-18 01:00:29 +01:00
  • 69902c99c8 Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct. Marc-Antoine Lortie 2019-12-17 18:22:22 -05:00
  • 188ee6562e Moved/Added several includes to file HL1MDLLoader.h. Marc-Antoine Lortie 2019-12-17 17:47:26 -05:00
  • fe2fdcf77c Removed unwanted PACK_STRUCT on union. Marc-Antoine Lortie 2019-12-17 17:27:21 -05:00
  • 330d9ca916 Replaced strncpy by individual character assigments. Marc-Antoine Lortie 2019-12-17 16:37:32 -05:00
  • e85776aaab Added missing null terminator. Marc-Antoine Lortie 2019-12-17 16:16:18 -05:00
  • 1e1248d019 Merge branch 'master' into warning-level-max Kim Kulling 2019-12-17 21:42:25 +01:00
  • a45e13b183 Fixed compilation issue. Marc-Antoine Lortie 2019-12-17 15:12:19 -05:00
  • 4144a222d3 Added HL1 MDL loader tests. Marc-Antoine Lortie 2019-12-16 11:31:41 -05:00
  • eed0bd3ef6 Added support to load Half-Life 1 MDL files. Marc-Antoine Lortie 2019-12-16 10:26:46 -05:00
  • 8a800e7aa5 Removed functionality and minor material-mapping fix bzt 2019-12-15 12:25:34 +01:00
  • 487ce954db Merge pull request #2819 from RichardTea/partial-cleanup-m3d Kim Kulling 2019-12-14 22:39:11 +01:00
  • 7244f53f5f Merge branch 'master' into partial-cleanup-m3d Kim Kulling 2019-12-14 19:22:19 +01:00
  • a10b0d4de3 Requested modifications bzt 2019-12-14 08:52:48 +01:00
  • 0ff04b9769 Update ColladaParser.cpp Kim Kulling 2019-12-13 11:20:50 +01:00
  • 512e6dff4f Fixed ANSI C compiler issue bzt 2019-12-13 09:16:41 +01:00
  • 2fc72c8f72 Merge branch 'master' into master Zoltan Baldaszti 2019-12-13 09:17:06 +01:00
  • 453eeb65cd Merge branch 'master' of https://github.com/bztsrc/assimp bzt 2019-12-13 09:05:06 +01:00
  • f151a5d11d MSVC2013 alternative to thread_local bzt 2019-12-13 09:04:40 +01:00
  • 53bf442beb Update ColladaParser.cpp Kim Kulling 2019-12-13 08:30:40 +01:00
  • 9ef2d7fb7d Merge branch 'master' into collada_modeller_metadata Kim Kulling 2019-12-13 08:28:50 +01:00
  • 71d7ff63f5 Update ColladaHelper.cpp Kim Kulling 2019-12-13 08:25:45 +01:00
  • b2ea762b02 Merge pull request #2829 from MalcolmTyrrell/fixTexcoord Kim Kulling 2019-12-13 08:23:30 +01:00
  • 8be1060ec4 Update m3d.h Kim Kulling 2019-12-13 08:21:45 +01:00
  • 32835873f0 Update m3d.h Kim Kulling 2019-12-13 08:19:39 +01:00
  • 6b2fe41a3b Replaced mutex with thread-local variable bzt 2019-12-13 07:30:59 +01:00
  • 30634ff56e Be more tolerant to invalid input bzt 2019-12-13 06:38:49 +01:00
  • 7a83e89b02 Merge branch 'master' into master Zoltan Baldaszti 2019-12-13 04:49:57 +01:00
  • b6553b8a78 Merge branch 'master' into fixTexcoord Malcolm Tyrrell 2019-12-12 12:19:02 +00:00
  • 2124da8340 Add a texcoord unit test. Malcolm Tyrrell 2019-12-12 12:06:36 +00:00
  • b70c05b4e0 Fix texcoords. Malcolm Tyrrell 2019-12-12 09:38:50 +00:00
  • 13427c8d2b Merge branch 'master' into warning-level-max Kim Kulling 2019-12-11 19:16:30 +01:00
  • 7223e0e3fc Merge pull request #2827 from muxanickms/3dsmax_pbr_materials Kim Kulling 2019-12-11 18:35:39 +01:00
  • e17431b993 Added extra check for file size bzt 2019-12-11 06:21:35 +01:00
  • fb95e49824 More MSVC workarounds bzt 2019-12-11 05:47:59 +01:00
  • 08c5fa37bf Add a support for 3DSMax Physically Based Materials for FBX format Mike Samsonov 2019-12-10 12:04:35 +00:00
  • 17aabc34cc MSVC workarounds bzt 2019-12-10 06:30:41 +01:00
  • 6df5e10c88 Merge pull request #2818 from RichardTea/backfacing-odd-negative-scale-2383 Gordon MacPherson 2019-12-09 19:06:32 +00:00
  • 660f3571d8 added AnimMesh.mName member IOhannes m zmölnig 2019-12-09 17:23:52 +01:00
  • 986b67801d Add Copyright common metadata to glTF importer/exporter RichardTea 2019-12-09 14:30:12 +00:00
  • f498a395e4 Add common metadata to Collada RichardTea 2019-12-09 14:05:41 +00:00
  • 4a8b7800ff Update M3D ASCII exporter ident and extension RichardTea 2019-12-09 11:23:57 +00:00
  • 9cabeddf4f Odd Negative Scale: PretransformVertices RichardTea 2019-12-09 11:07:13 +00:00
  • 193b02cdac Odd negative scale: OptimizeGraph RichardTea 2019-12-09 10:42:50 +00:00
  • 463573c771 Apply clangformat RichardTea 2019-12-09 09:56:01 +00:00
  • 6b5384afa6 Merge branch 'master' into python-fixes Kim Kulling 2019-12-08 12:58:50 +01:00
  • d8575b2b55 Merge pull request #2814 from assimp/issue_2809 Kim Kulling 2019-12-08 12:58:28 +01:00
  • e3da92f7d3 closes https://github.com/assimp/assimp/issues/2809: fix crash for special ifc file. Kim Kulling 2019-12-08 10:12:14 +01:00
  • fbebeba2b0 Merge pull request #2805 from RichardTea/partial-cleanup-m3d Kim Kulling 2019-12-08 09:02:06 +01:00
  • 630f013a5e fix field name "Mesh.mAnimMesh" -> "Mesh.mAnimMeshes" IOhannes m zmölnig 2019-12-07 22:10:26 +01:00
  • d24adbd32c aiString.length is really of type "ai_uint32" which corresponds to "c_uint32" IOhannes m zmölnig 2019-12-07 22:09:03 +01:00
  • 298a89b4ee remove trailing whitespace IOhannes m zmölnig 2019-12-07 22:06:14 +01:00
  • 71cac7ab8d lower-case PEP263 encoding declaration IOhannes m zmölnig 2019-12-07 22:04:04 +01:00
  • 747e12465b Merge branch 'master' into partial-cleanup-m3d Kim Kulling 2019-12-07 19:43:05 +01:00
  • e7ed315145 Merge pull request #2801 from RichardTea/fix-2799-2785 Kim Kulling 2019-12-07 19:34:54 +01:00
  • f9e861527b Merge branch 'master' into fix-2799-2785 Kim Kulling 2019-12-07 13:47:25 +01:00
  • 016115628e Merge pull request #2810 from MalcolmTyrrell/ModellerMetaData Kim Kulling 2019-12-07 13:40:21 +01:00
  • 9f3c26dbd8 Update Importer.cpp Kim Kulling 2019-12-07 09:18:45 +01:00
  • 7648c438ca Update Importer.cpp Kim Kulling 2019-12-07 09:08:15 +01:00
  • 26f6e5ad30 Update Importer.cpp Kim Kulling 2019-12-07 08:58:47 +01:00
  • ef13fb2ddd Update Importer.cpp Kim Kulling 2019-12-06 21:38:07 +01:00
  • c1706d9bf8 Update metadata.h Kim Kulling 2019-12-06 21:24:04 +01:00