Commit Graph

  • c2097d9d0a Merge branch 'master' into issue_2431 Kim Kulling 2019-06-12 23:18:44 +02:00
  • 05de460ced Merge pull request #2497 from assimp/kimkulling-patch-doc Kim Kulling 2019-06-12 23:18:29 +02:00
  • 0021c93892 closes https://github.com/assimp/assimp/issues/2431: use irrXml directly for mingw compiler. Kim Kulling 2019-06-12 22:12:38 +02:00
  • 6ed753d80a Merge branch 'master' into kimkulling-patch-doc Kim Kulling 2019-06-12 21:58:24 +02:00
  • fc06de82c6 Update Readme.md Kim Kulling 2019-06-12 20:44:02 +02:00
  • 963c6f1977 Merge branch 'master' into pkoller-patch-1 Kim Kulling 2019-06-12 18:44:39 +02:00
  • a4907e54b1 Merge pull request #2506 from assimp/reorg Kim Kulling 2019-06-12 15:05:53 +02:00
  • 66f693a6a4 Update IRRLoader.cpp Kim Kulling 2019-06-12 10:25:11 +02:00
  • e914b9531b Update IRRLoader.h Kim Kulling 2019-06-12 00:55:06 +02:00
  • 4dcb3c9235 Update ImporterRegistry.cpp Kim Kulling 2019-06-11 21:55:21 +02:00
  • fc065d8ab4 Merge branch 'master' into reorg Kim Kulling 2019-06-11 20:59:46 +02:00
  • a6e3fc3fd9 Fix case-sensitive folder name for unix platforms. Kim Kulling 2019-06-11 20:54:01 +02:00
  • cc10967913 Fix the build. Kim Kulling 2019-06-11 20:17:50 +02:00
  • d24b6e220b toolset changes in debug cmake template PK 2019-06-11 15:24:39 +02:00
  • 03c01004c5 toolset also in cmake release template PK 2019-06-11 15:23:05 +02:00
  • d448b49ae1 fixed MSVC toolset versions >140 PK 2019-06-11 15:16:53 +02:00
  • 1651f16239 Merge pull request #2501 from petrmohelnik/glTF-importer---clean-all-member-arrays Kim Kulling 2019-06-11 11:32:34 +02:00
  • f76d77955d Merge branch 'master' into reorg Kim Kulling 2019-06-11 00:22:50 +02:00
  • 2da3a38d60 Fix the compile pass, still unresolved symbols. Kim Kulling 2019-06-10 23:26:00 +02:00
  • 7e20356a20 Update XFileParser.cpp Kim Kulling 2019-06-10 20:32:56 +02:00
  • 47c70a8811 Merge pull request #12 from assimp/master RichardTea 2019-06-10 10:16:44 +01:00
  • 6fc42cb898 Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2019-06-10 00:39:05 +02:00
  • a4bda3a205 Update XFileParser.cpp Kim Kulling 2019-06-09 21:25:25 +02:00
  • 2d985b92c9 Fix references in cmake file. Kim Kulling 2019-06-09 18:43:56 +02:00
  • 83247e3fbd Merge branch 'master' into glTF-importer---clean-all-member-arrays petrmohelnik 2019-06-09 15:52:32 +02:00
  • 56d145e26a Merge pull request #2502 from arkeon7/Ogre_with_skeleton_missing Kim Kulling 2019-06-09 01:21:35 +02:00
  • cbd5c5b284 Merge branch 'master' into Ogre_with_skeleton_missing Kim Kulling 2019-06-08 21:31:47 +02:00
  • 4a46717a77 Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2019-06-08 09:09:37 +02:00
  • 7dc38faeba Merge pull request #2483 from akien-mga/code-chmod-644 Kim Kulling 2019-06-08 09:05:55 +02:00
  • 5679dd435a Prevent crash when Ogre skeleton file is missing Arkeon 2019-06-07 09:49:24 +02:00
  • ee7a2b6e31 Merge pull request #11 from assimp/master RichardTea 2019-06-07 08:11:08 +01:00
  • 57c46db042 Reorg of code. Kim Kulling 2019-06-06 14:45:43 +02:00
  • 589a306c85 Merge branch 'master' into code-chmod-644 Kim Kulling 2019-06-06 09:16:07 +02:00
  • 6ed4f5d936 JT: Inital commit. Kim Kulling 2019-06-06 08:29:12 +02:00
  • 1855bf44f9 glTF importer - clean all member arrays petrmohelnik 2019-06-05 18:51:49 +02:00
  • 83237de02f Merge pull request #2485 from jackoalan/static-lib-export Kim Kulling 2019-06-04 19:43:19 +02:00
  • e8a4d60b6f Merge branch 'master' into static-lib-export Kim Kulling 2019-06-04 15:43:42 +02:00
  • 5dcb2cb8c0 Merge pull request #2473 from RichardTea/slow_xml_load Kim Kulling 2019-06-04 15:20:20 +02:00
  • cead840a75 Merge branch 'master' into slow_xml_load Kim Kulling 2019-06-04 12:50:43 +02:00
  • 4de162fa79 Merge pull request #2484 from aavenel/FindInstancesProcessOptim Kim Kulling 2019-06-04 12:50:16 +02:00
  • dcee3295cc Merge branch 'master' into FindInstancesProcessOptim Kim Kulling 2019-06-04 10:36:59 +02:00
  • fe4fd00a82 Merge branch 'master' into slow_xml_load Kim Kulling 2019-06-03 22:58:02 +02:00
  • 4d66b33253 Update Readme.md Kim Kulling 2019-06-03 22:36:57 +02:00
  • 35f9517510 Fix dox Kim Kulling 2019-06-03 22:34:22 +02:00
  • 04117e1378 Merge pull request #2490 from olsoneric/add_null_check_py Kim Kulling 2019-06-03 00:11:11 +02:00
  • f0f2a7fc09 Merge branch 'master' into add_null_check_py Kim Kulling 2019-06-02 12:54:51 +02:00
  • 0215d77abd Merge pull request #2496 from muxanickms/topic/double_precision_fix Kim Kulling 2019-06-02 12:54:20 +02:00
  • 48ed2d2d3c Double precision fix Mike Samsonov 2019-05-30 10:54:44 +01:00
  • 5bc6787d57 Merge branch 'master' into FindInstancesProcessOptim Kim Kulling 2019-05-29 12:21:48 +02:00
  • 1370e0b26f Merge pull request #2491 from marzer/visual-studio-fixes Kim Kulling 2019-05-29 12:20:56 +02:00
  • cf4d656bbf Merge branch 'master' into visual-studio-fixes Kim Kulling 2019-05-29 11:12:01 +02:00
  • a6b51ef911 Merge branch 'master' into code-chmod-644 Kim Kulling 2019-05-29 08:59:47 +02:00
  • eb6d9db505 Merge pull request #2480 from aavenel/ParsePostProcessArgs Kim Kulling 2019-05-29 08:59:06 +02:00
  • 85a7f46049 Merge branch 'master' into ParsePostProcessArgs Kim Kulling 2019-05-29 00:03:09 +02:00
  • 873762cf60 Merge pull request #2482 from akien-mga/utf8 Kim Kulling 2019-05-29 00:02:29 +02:00
  • f114aa8d9b Merge branch 'master' into ParsePostProcessArgs Kim Kulling 2019-05-28 20:11:43 +02:00
  • 51527ba038 Merge branch 'master' into utf8 Kim Kulling 2019-05-28 19:53:14 +02:00
  • dff92d7733 quality-of-life improvements for Visual Studio Mark Gillard 2019-05-27 21:14:50 +03:00
  • 3924a5c32a Ensure obj is not null before using hasattr Eric Olson 2019-05-27 12:59:00 -05:00
  • ca13160369 Merge pull request #2472 from ucla-pbpl/set_stl_mesh_names Kim Kulling 2019-05-26 08:53:20 +02:00
  • d048bccad1 Export static libaries as CMake package Jack Andersen 2019-05-22 13:54:15 -10:00
  • 5c3662dc6d Merge branch 'master' into set_stl_mesh_names Kim Kulling 2019-05-24 21:49:35 +02:00
  • 4feefaf5f7 Merge pull request #2469 from muxanickms/topic/fbx_node_naming_optimization Kim Kulling 2019-05-24 21:48:07 +02:00
  • b03b3b9c03 Initial parsing for header and more. Kim Kulling 2019-05-24 17:22:54 +02:00
  • fdcae81b61 Merge branch 'master' into set_stl_mesh_names Brian Naranjo 2019-05-23 11:21:49 -07:00
  • e1ed975839 Merge branch 'master' into topic/fbx_node_naming_optimization Kim Kulling 2019-05-22 20:13:36 +02:00
  • daef984ac6 Optim FindInstancesProcess Alexandre Avenel 2019-05-22 20:00:33 +02:00
  • f0a0de63e9 Merge pull request #2475 from ruxkor/master Kim Kulling 2019-05-22 19:03:36 +02:00
  • fc7575f5c5 Remove Unix executable bit on code files Rémi Verschelde 2019-05-22 10:23:06 +02:00
  • 5fa750fda0 Fix code files encoding to make them all UTF-8 Rémi Verschelde 2019-05-22 10:19:32 +02:00
  • 1d05f1b222 Merge branch 'master' into master Kim Kulling 2019-05-22 00:14:18 +02:00
  • 9787ac724f Merge pull request #2468 from muxanickms/topic/fbx_file_more_than_4gb Kim Kulling 2019-05-22 00:13:33 +02:00
  • 52d4564b7e Merge branch 'master' into topic/fbx_file_more_than_4gb Kim Kulling 2019-05-21 20:12:57 +02:00
  • 0e8444b83f Merge pull request #2466 from muxanickms/topic/fragmented_embedded_textures Kim Kulling 2019-05-21 20:12:31 +02:00
  • a60b7696e3 Parse post process arguments when using info tool Alexandre Avenel 2019-02-17 11:44:02 +01:00
  • 0eec1c1d4a One map to rule them all Mike Samsonov 2019-05-21 16:05:38 +01:00
  • 7ac831489c Merge branch 'master' into set_stl_mesh_names Brian Naranjo 2019-05-20 08:52:20 -07:00
  • b10dc5747b Revert "Remove experimental change unintentionally included in commit f001dfc8" Andor Goetzendorff 2019-05-20 15:35:19 +02:00
  • b1975aaabc Merge branch 'master' into slow_xml_load RichardTea 2019-05-20 14:11:26 +01:00
  • b8262c4c70 Merge pull request #8 from assimp/master RichardTea 2019-05-20 08:09:55 -05:00
  • 45c12cd5fb Update irrXMLWrapper.h RichardTea 2019-05-20 13:49:56 +01:00
  • 627cb93b0b Merge branch 'master' into topic/fragmented_embedded_textures Kim Kulling 2019-05-19 20:16:49 +02:00
  • b4eb974d9e Merge pull request #2464 from muxanickms/topic/exception_spam_fix_fbxmaterial Kim Kulling 2019-05-19 19:50:43 +02:00
  • ff4ab7ff2e Add mesh names to imported ASCII STL Brian Naranjo 2019-05-17 11:48:57 -07:00
  • 2f4cb93764 Merge branch 'master' into topic/exception_spam_fix_fbxmaterial Kim Kulling 2019-05-17 19:43:54 +02:00
  • 9740c043c6 Merge pull request #2463 from muxanickms/topic/degenerate_area_fix Kim Kulling 2019-05-16 23:30:07 +02:00
  • 4b10c7e432 Merge branch 'master' into topic/degenerate_area_fix Kim Kulling 2019-05-16 21:44:46 +02:00
  • d29e245536 Merge pull request #2462 from assimp/kimkulling-2449 Kim Kulling 2019-05-16 21:44:30 +02:00
  • 81f8ebf2d4 Merge branch 'master' into kimkulling-2449 Kim Kulling 2019-05-16 17:04:09 +02:00
  • 2ba3d956d1 Merge pull request #2458 from jackoalan/pdb-install-fix Kim Kulling 2019-05-16 17:03:36 +02:00
  • 7cd021e704 Merge branch 'master' into pdb-install-fix Kim Kulling 2019-05-16 14:49:29 +02:00
  • 6fda615706 Merge pull request #2434 from mvorbrodt/master Kim Kulling 2019-05-16 14:48:21 +02:00
  • 6c13ec8190 fix for clang runtime checks for overflow Mike Samsonov 2019-05-14 15:45:57 +01:00
  • c84ac7a135 Fragmented FBX ASCII emdedded resource Mike Samsonov 2019-05-14 14:43:16 +01:00
  • 13bba4fb4c even more efficient Mike Samsonov 2019-05-15 11:26:09 +01:00
  • b957d44943 Node names optimization and fixing non-unique name Mike Samsonov 2019-05-14 17:58:06 +01:00
  • c58ed8da22 Support for FBX file sizes more than 4GB Mike Samsonov 2019-05-14 15:24:23 +01:00
  • 4e03a2c00d Exception spam fix for FBXMaterial Mike Samsonov 2019-05-14 11:55:46 +01:00
  • 5bca43be74 Degenerate triangles with small area removing fix Mike Samsonov 2019-05-14 11:33:42 +01:00
  • 77281b75b2 Merge branch 'master' into master Kim Kulling 2019-05-16 11:13:48 +02:00