Commit Graph

  • 719cc82a1f Apply clangformat RichardTea 2020-07-17 10:29:44 +0100
  • 8c60879485 Rollup to 'upstream/master' RichardTea 2020-07-17 10:03:31 +0100
  • 516bdc2a4b
    Merge branch 'master' into master Kim Kulling 2020-07-16 22:48:02 +0200
  • c55ca47666
    Merge pull request #3322 from AndrewJDR/master Kim Kulling 2020-07-16 22:47:17 +0200
  • 147c5f7cd2
    Merge branch 'master' into master Kim Kulling 2020-07-16 21:37:46 +0200
  • 0a165ee666
    Merge pull request #3311 from ms-maxvollmer/gltf1_gltf2_split Kim Kulling 2020-07-16 21:37:08 +0200
  • deddaf49df finish migrate ogrexmlserializer. Kim Kulling 2020-07-16 11:33:28 +0200
  • df8792d24b
    Merge branch 'master' into gltf1_gltf2_split Kim Kulling 2020-07-16 10:45:55 +0200
  • 44fd987d57
    Merge pull request #3330 from infosia/bad_nodeanim_ptr Kim Kulling 2020-07-16 10:39:21 +0200
  • 84e68eaf24 fix invalid pointer for bone animation Kota Iguchi 2020-07-16 15:26:02 +0900
  • 04df5f8b1e Don't use make_unique Malcolm Tyrrell 2020-07-15 15:47:25 +0100
  • e51e07982d Remove generic lambda usage. Malcolm Tyrrell 2020-07-15 15:05:42 +0100
  • e1bab44e19 Exception safety Malcolm Tyrrell 2020-07-15 15:02:27 +0100
  • 37e1fb9cd7 Fix message Malcolm Tyrrell 2020-07-15 14:19:13 +0100
  • f3170a96ba Ensure data does not depend on faces we may not have created. Malcolm Tyrrell 2020-07-15 12:36:48 +0100
  • d4f5f29b44 Add missing asset Malcolm Tyrrell 2020-07-15 12:22:39 +0100
  • fff6396e3c Rename to avoid overloading problems. Malcolm Tyrrell 2020-07-15 12:22:28 +0100
  • 212903e935 Unit test for all indices out of range, and fix. Malcolm Tyrrell 2020-07-15 12:19:00 +0100
  • 7e7161852a Add a unit test. Malcolm Tyrrell 2020-07-15 11:19:10 +0100
  • c0d978786e Fix warning Malcolm Tyrrell 2020-07-15 09:12:52 +0100
  • a56134ba33 Drop faces when indices are out of range. Malcolm Tyrrell 2020-07-15 09:05:09 +0100
  • 77cf6e3433 Ensure that zip.h warning disable is pushed awr1 2020-07-14 22:07:24 -0500
  • 638369e995 Try to fix lexing issue with preproc w/r/t __has_warning awr1 2020-07-14 21:58:36 -0500
  • cc8cd88d7a Preproc conditional should be &&, not || awr1 2020-07-14 21:50:22 -0500
  • bad0df9a1a Remove unnecessary inversion in preproc awr1 2020-07-14 21:48:46 -0500
  • b3f61f8759 Fix error where -Wunused-but-set-variable might not be available awr1 2020-07-14 21:44:33 -0500
  • 3bf6963d20 Use a better divider for import error awr1 2020-07-14 21:34:30 -0500
  • 93d567e3b1 Fix sprintf format string awr1 2020-07-14 21:32:22 -0500
  • 700d8e6614 Fix MinGW builds (issues related to pragmas and format strings) awr1 2020-07-14 21:19:07 -0500
  • 0bad2c7b6a Move library configuration outside Hunter block Rahul Sheth 2020-07-14 18:40:54 -0400
  • abc6b9ce4c ifdef fixes to fix MSVC warnings Rahul Sheth 2020-07-14 14:07:36 -0400
  • 209a61d0e7 Update hunter and utf8cpp inclusion Rahul Sheth 2020-07-14 13:55:37 -0400
  • 84e342acd7 DefaultIOStream: Remove assert on empty count Ryan Styrczula 2020-07-14 10:39:18 -0400
  • b19ebf5d54 Fix merge conflicts. Kim Kulling 2020-07-14 09:02:14 +0200
  • 8cfd2a4cc1 Migrate OgreSerializer. Kim Kulling 2020-07-14 09:00:06 +0200
  • 67a710efad
    Merge pull request #3320 from IOBYTE/master Kim Kulling 2020-07-13 22:10:12 +0200
  • f5d5d7c5ed
    Merge branch 'master' into master Kim Kulling 2020-07-13 20:35:24 +0200
  • bdcad5cd0a
    Merge pull request #3292 from rmstyrczula/master Kim Kulling 2020-07-13 20:32:44 +0200
  • 0c2f7a119c FBXExporter: Forgot WritePropColor defaultValue Ryan Styrczula 2020-06-22 15:22:08 -0400
  • 6619ec8253 FBXExporter: Use scene metadata for global settings Ryan Styrczula 2020-06-22 14:26:37 -0400
  • c8d759de64
    Merge branch 'master' into master Kim Kulling 2020-07-12 19:11:02 +0200
  • daea8bcd64
    Merge branch 'master' into remove-UpdateAssimpLibsDebugSymbolsAndDLLs Kim Kulling 2020-07-12 19:10:30 +0200
  • 4e5017df69
    Merge pull request #3082 from NickNick/macos-fixes Kim Kulling 2020-07-12 19:09:16 +0200
  • b1cd889c9d
    Merge branch 'assimp_5.0_release' into macos-fixes Kim Kulling 2020-07-12 19:08:53 +0200
  • aff5bba9da
    Merge pull request #3289 from ifiddynine/patch-1 Kim Kulling 2020-07-12 19:05:55 +0200
  • 78d0b81b6c
    Merge branch 'master' into patch-1 Kim Kulling 2020-07-12 18:54:34 +0200
  • 411bf89b64
    Merge pull request #3323 from assimp/LoicFr-master Kim Kulling 2020-07-12 18:52:38 +0200
  • eaac92830a Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master LoicFr-master Kim Kulling 2020-07-12 12:05:34 +0200
  • a9a0c30932 Build viewer and publish artifacts on windows-msvc. Andrew Johnson 2020-06-19 00:15:12 -0700
  • 231447c8d6
    Merge pull request #3227 from thomasbiang/gltf2_sparseAccessor_export Kim Kulling 2020-07-11 23:06:47 +0200
  • b1dd77fbbc
    Merge branch 'master' into gltf2_sparseAccessor_export Kim Kulling 2020-07-11 22:57:31 +0200
  • ec156e4da3
    Merge pull request #3280 from thomasbiang/extras_property_callback Kim Kulling 2020-07-11 22:56:38 +0200
  • 306e03d497
    Merge branch 'master' into extras_property_callback Kim Kulling 2020-07-11 22:46:19 +0200
  • 108b3a62e5
    Update Exporter.hpp Kim Kulling 2020-07-11 22:45:45 +0200
  • 1324b4b27d
    Merge pull request #3321 from assimp/kimkulling-patch-7 Kim Kulling 2020-07-11 22:43:44 +0200
  • b8ec93aa21
    use c-styl cast in a c-file Kim Kulling 2020-07-11 22:34:43 +0200
  • 2cd1192bf1
    Merge pull request #3300 from mahiuchun/strrchr Kim Kulling 2020-07-11 21:19:55 +0200
  • 9682ab0685
    Merge branch 'master' into strrchr Kim Kulling 2020-07-11 21:10:58 +0200
  • 21678df589 ogre + collada migration. Kim Kulling 2020-07-10 22:25:38 +0200
  • 1379175f18
    Merge pull request #3314 from assimp/issue_3252 Kim Kulling 2020-07-09 09:50:32 +0200
  • 628394baec check for invalid vertex Robert Reif 2020-07-07 23:29:54 -0400
  • d79a617e18 Rollup to 'upstream/master' RichardTea 2020-07-07 20:02:46 +0100
  • 75d0a818fd closes https://github.com/assimp/assimp/issues/3275 : fix the build when all exporters are disabled. issue_3275 Kim Kulling 2020-07-07 19:03:48 +0200
  • 9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. issue_3252 kimkulling 2020-07-07 17:35:03 +0200
  • 81c15b38ae fix merge kimkulling 2020-07-07 17:16:53 +0200
  • 37c74f6fa3 add test to unit for acc file format loader Robert Reif 2020-07-06 20:16:22 -0400
  • f753a6e7ad add acc file test using existing ac file converted to acc format Robert Reif 2020-07-06 20:14:03 -0400
  • 6c29247180 add triangle strip support to AC file loader Robert Reif 2020-07-06 17:41:14 -0400
  • fb11705dd0
    Merge branch 'master' into gltf1_gltf2_split Max Vollmer (Microsoft Havok) 2020-07-06 09:11:06 +0100
  • abf43eaf74 * Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently. * ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before Max Vollmer 2020-07-05 19:22:31 +0100
  • a211aff522
    Merge pull request #3307 from MalcolmTyrrell/defsIncludeFix Kim Kulling 2020-07-05 20:20:23 +0200
  • d04f8b3174
    Merge branch 'master' into defsIncludeFix Kim Kulling 2020-07-05 18:59:37 +0200
  • 95a23af16f
    Merge pull request #3309 from mahiuchun/const Kim Kulling 2020-07-04 21:22:42 +0200
  • 77b705048b fix merge issues. Kim Kulling 2020-07-04 13:42:23 +0200
  • 839986ca14 next step of AMF-Migration. Kim Kulling 2020-07-04 09:04:06 +0200
  • 3fb7747429 Improve ToBinary() for double precision. Hill Ma 2020-07-03 18:14:45 -0700
  • d74c10dcb7 Merge branch 'master' into pugi_xml Kim Kulling 2020-07-03 17:29:38 +0200
  • 10c709831f
    Merge pull request #3306 from assimp/issue_3305 Kim Kulling 2020-07-02 17:46:53 +0200
  • 51150cb3df Ensure asserts are defined where expected. Malcolm Tyrrell 2020-07-02 14:53:29 +0100
  • 693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. Kim Kulling 2020-07-02 15:22:06 +0200
  • b1369d0912 next steps. Kim Kulling 2020-07-02 15:18:59 +0200
  • 9e27fb3b89 Rollup to upstream/master RichardTea 2020-07-01 16:28:00 +0100
  • 7b7764afb9
    Merge pull request #3301 from mahiuchun/double Kim Kulling 2020-06-30 21:24:35 +0200
  • 7fda533484
    Merge branch 'master' into double Kim Kulling 2020-06-30 21:12:02 +0200
  • dea412c9a0
    Merge pull request #3303 from malortie/fix-loop-variable-HL1MDLLoader Kim Kulling 2020-06-30 21:11:32 +0200
  • 97085c1c05 update sync Yingying Wang 2020-06-30 11:48:37 -0700
  • 36f899bf09 sync update Yingying Wang 2020-06-30 11:45:11 -0700
  • 3f2e5518eb update sync Yingying Wang 2020-06-30 11:29:08 -0700
  • edd860dbd8 Fix win32 build break Bernhard Reitinger 2020-06-30 11:21:36 +0200
  • d8241cd7a9 Fix build break on github workflow Bernhard Reitinger 2020-06-30 10:44:45 +0200
  • 8bdfa7041b Fix entrypoint script Bernhard Reitinger 2020-06-30 09:09:11 +0200
  • 15905cf217 Fix missing color in pointcloud (#5) Elisabeth Reitinger 2020-06-29 08:00:44 +0200
  • cb89e9873e Add Dockerfile for building an Alpine-based image Bernhard Reitinger 2020-05-25 19:28:20 +0200
  • 81182762ba Bug fix for meshes with no triangles (#3) Elisabeth Reitinger 2020-05-19 15:28:14 +0200
  • fb1df21c55 REX exporter: add support for lines and points (#2) Elisabeth Reitinger 2020-05-11 10:38:10 +0200
  • bc223d1450 Merge REXfile importer with current master Elisabeth Reitinger 2020-04-27 21:14:30 +0200
  • 03340787ec Fixed variable in loop - HL1MDLLoader.cpp Marc-Antoine Lortie 2020-06-29 07:50:51 -0400
  • 4ff5a06ef4
    Merge pull request #3302 from assimp/kimkulling-patch-6 Kim Kulling 2020-06-29 12:52:19 +0200
  • 1ab7a3a16b
    Merge branch 'master' into kimkulling-patch-6 kimkulling-patch-6 Kim Kulling 2020-06-29 10:36:09 +0200
  • 718f81ddcf
    Merge pull request #3293 from ifiddynine/patch-2 Kim Kulling 2020-06-29 10:35:41 +0200