Commit Graph

  • ac16a857ff Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2 Marc-Antoine Lortie 2020-04-13 09:08:45 -0400
  • 74c8d09bd8 contrib/zlib: disable dynamic library building Peter Seiderer 2020-04-12 18:19:13 +0200
  • e4ceccb42d
    Merge branch 'master' into master György Straub 2020-04-12 15:58:25 +0100
  • 91ff457c87
    Merge branch 'master' into sample-simpletextureddirectx11-nullptr Kim Kulling 2020-04-10 19:44:04 +0200
  • d88a151001
    Merge branch 'master' into kimkulling-enable-sanitizers Kim Kulling 2020-04-10 19:34:14 +0200
  • 9b694a8645
    Merge pull request #2885 from assimp/kimkulling_dev Kim Kulling 2020-04-10 18:58:29 +0200
  • 13429485d9
    Update CMakeLists.txt Kim Kulling 2020-04-10 17:00:38 +0200
  • d2499ac197
    Update CMakeLists.txt Kim Kulling 2020-04-10 12:52:54 +0200
  • 872001c1c9
    Merge branch 'master' into sample-simpletextureddirectx11-nullptr Kim Kulling 2020-04-10 12:29:51 +0200
  • 9b671c6eb4
    Update CMakeLists.txt Kim Kulling 2020-04-10 12:27:40 +0200
  • a14b5fb06f
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-04-10 08:44:19 +0100
  • 485d7ab52e
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-04-10 08:44:18 +0100
  • 79af2b1a5c
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-04-09 19:55:45 +0200
  • 3ad53ab630 Printing file metadata Trevor David Black 2020-04-08 13:29:03 -0700
  • 8ecb7cafc6
    Merge branch 'master' into kimkulling-enable-sanitizers Kim Kulling 2020-04-08 22:14:22 +0200
  • 3d95e75774
    Merge pull request #3141 from malortie/sample-simpletexturedogl-nullptr Kim Kulling 2020-04-08 22:13:50 +0200
  • 909a838ea8
    Merge branch 'master' into sample-simpletexturedogl-nullptr Kim Kulling 2020-04-08 20:53:25 +0200
  • bb7212c46a
    Merge pull request #3139 from malortie/assimp-viewer-nullptr Kim Kulling 2020-04-08 20:52:43 +0200
  • c6045438dc
    Merge branch 'master' into assimp-viewer-nullptr Kim Kulling 2020-04-08 20:17:37 +0200
  • faf6ee2607
    Merge branch 'master' into master György Straub 2020-04-08 12:11:02 +0100
  • 592e71dd7e Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL. Marc-Antoine Lortie 2020-04-07 16:43:36 -0400
  • abb628bc58
    Merge pull request #3125 from malortie/fix-sample-simpletexturedogl-w4-compile-warnings Kim Kulling 2020-04-07 20:43:04 +0200
  • d0e14e4140
    Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings Kim Kulling 2020-04-07 18:47:32 +0200
  • 4f98830974 Fix SimpleOGL-warnings. Kim Kulling 2020-04-07 18:38:53 +0200
  • 3510d85967 Replaced NULL with nullptr for pointers in Assimp viewer. Marc-Antoine Lortie 2020-04-07 10:56:22 -0400
  • 755f3748f1
    Merge branch 'master' into master György Straub 2020-04-07 11:46:14 +0100
  • b59e6a2df4
    Merge pull request #3129 from malortie/fix-assimp-viewer-w4-compile-warnings Kim Kulling 2020-04-07 11:25:28 +0200
  • c79c6f5ae7
    Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings Kim Kulling 2020-04-07 11:09:25 +0200
  • 0f3b196afc
    Merge pull request #3126 from vmatare/master Kim Kulling 2020-04-07 11:08:55 +0200
  • 8c3b374486 Pbrt file exporter hello world Trevor David Black 2020-04-06 12:12:37 -0700
  • 06f148defc
    Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings Kim Kulling 2020-04-06 20:59:36 +0200
  • 09eba0f039
    Merge branch 'master' into master Kim Kulling 2020-04-06 20:42:41 +0200
  • 4eb129fa6d
    Merge pull request #3137 from assimp/issue_2166 Kim Kulling 2020-04-06 20:42:08 +0200
  • 9a11d91cb8 code reformattings. Kim Kulling 2020-04-06 13:33:03 +0200
  • 131aed73b0 closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata. Kim Kulling 2020-04-06 11:16:16 +0200
  • b7d73dfa69
    Merge branch 'master' into master György Straub 2020-04-05 06:03:19 +0100
  • 105b2bdeaf Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11. Marc-Antoine Lortie 2020-04-04 15:37:50 -0400
  • 132ecae6f4
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-04-04 18:28:50 +0200
  • a73fd6c84c
    Update MessageProc.cpp Kim Kulling 2020-04-04 18:24:19 +0200
  • 1b0a0675dc Applied review requested changes - renamed _data to data. Marc-Antoine Lortie 2020-04-04 10:32:29 -0400
  • 1cb564aa4b Fixed /W4 compile warnings in Assimp viewer. Marc-Antoine Lortie 2020-04-03 14:36:44 -0400
  • 732dc6a5d6
    Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings Marc-Antoine Lortie 2020-04-03 14:15:31 -0400
  • 085212e58a
    Merge pull request #3127 from malortie/fix-sample-simpletextureddirectx11-w4-compile-warnings Kim Kulling 2020-04-03 18:56:34 +0200
  • 4bae1d2596 Fixed warning C4018: '<': signed/unsigned mismatch Marc-Antoine Lortie 2020-04-03 10:07:44 -0400
  • e67ddd0ca1 Fixed /W4 compile warnings in sample SimpleTexturedDirectx11. Marc-Antoine Lortie 2020-04-03 09:43:01 -0400
  • 956c57f18e
    Merge branch 'master' into master György Straub 2020-04-03 13:42:59 +0100
  • fa9ccfba61 Applied review requested changes for #3125 Marc-Antoine Lortie 2020-04-03 07:50:07 -0400
  • a07bf8b26f
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-04-03 08:40:32 +0100
  • d966f3394b
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-04-03 08:40:29 +0100
  • 9fb81c3be6 use GNUInstallDirs where possible Victor Mataré 2020-03-31 21:30:07 +0200
  • 895675535a Fixed /W4 compile warnings in sample SimpleTexturedOpenGL. Marc-Antoine Lortie 2020-04-02 15:28:06 -0400
  • 6b68c0ee45
    Merge pull request #3124 from malortie/fix-sample-simpleogl-w4-compile-warnings Kim Kulling 2020-04-02 21:02:14 +0200
  • c0273a2bb4
    Merge branch 'master' into fix-sample-simpleogl-w4-compile-warnings Marc-Antoine Lortie 2020-04-02 14:43:24 -0400
  • 210f40e984
    Merge pull request #3113 from thomasbiang/assimp_gltf2_exporter Kim Kulling 2020-04-02 20:39:59 +0200
  • 8840449226
    Merge pull request #3115 from vmatare/assimp_5.0_release Kim Kulling 2020-04-02 20:39:03 +0200
  • 56e2f2e37e Fixed /W4 compile warnings in sample SimpleOpenGL. Marc-Antoine Lortie 2020-04-02 14:19:16 -0400
  • 9511976485
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-04-02 08:08:13 +0100
  • e61cb1794f
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-04-02 08:08:08 +0100
  • c21a1ffffa
    Remove comments to increase readability Kim Kulling 2020-04-01 11:16:39 +0200
  • 750bd93eb3
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-04-01 11:04:54 +0300
  • 5205c4a422
    Merge branch 'master' into master György Straub 2020-04-01 08:02:34 +0100
  • a7208b02e0
    Merge branch 'master' into assimp_gltf2_exporter Kim Kulling 2020-04-01 08:42:48 +0200
  • bfedc05045
    Merge pull request #3117 from malortie/remove-unneeded-headers Kim Kulling 2020-04-01 08:35:40 +0200
  • 06e40b9820 Removed unneeded SceneDiffer.h includes. Marc-Antoine Lortie 2020-03-31 17:22:56 -0400
  • 53990ffa42 Check for existed bone Alexey Medvedev 2020-03-31 14:18:51 -0700
  • 8bd8a3ced3
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-31 22:03:27 +0200
  • c31e49198a closes https://github.com/assimp/assimp/issues/3103: always enable warnings as errors . Kim Kulling 2020-03-31 22:01:04 +0200
  • cbf94fd62f use GNUInstallDirs where possible Victor Mataré 2020-03-31 21:30:07 +0200
  • 0af06d3f0c
    Merge pull request #3114 from assimp/kimkulling-patch-5 Kim Kulling 2020-03-31 20:17:56 +0200
  • 323686f878
    Fix funding Kim Kulling 2020-03-31 19:59:02 +0200
  • 17d8aa008e
    Merge pull request #3112 from assimp/issue_3104 Kim Kulling 2020-03-31 19:46:24 +0200
  • f5324e23ef closes https://github.com/assimp/assimp/pull/3104: remove unused includes. Kim Kulling 2020-03-31 19:35:19 +0200
  • 773107b015
    Merge branch 'master' into master György Straub 2020-03-31 14:09:13 +0100
  • f072d26c35
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-03-31 15:02:52 +0300
  • a691e8cd3e
    Disable terragen test. Kim Kulling 2020-03-31 13:49:59 +0200
  • bc3de4079a
    Disable terragen test. Kim Kulling 2020-03-31 13:49:22 +0200
  • 4b042cd26f
    Enable clang via cmake Kim Kulling 2020-03-31 13:33:12 +0200
  • 87e2d3a54d Added support for glTF2 sparse accessors. György Straub 2020-03-30 14:30:33 +0100
  • 7cde0f9773
    Try to use clang Kim Kulling 2020-03-31 12:23:08 +0200
  • 54419eb9a0
    Merge branch 'master' into GLTF2_invalid_buffer_fix Max Vollmer (Microsoft Havok) 2020-03-31 09:54:12 +0100
  • 806d81c919
    Merge branch 'master' into GLTF2_recursive_references_fix Max Vollmer (Microsoft Havok) 2020-03-31 09:54:01 +0100
  • 51438bff87
    Merge branch 'master' into cmake_targets_determine_lib_path Kim Kulling 2020-03-31 10:31:31 +0200
  • 3ef46b0edd Weights and bones count checks Alexey Medvedev 2020-03-30 16:56:33 -0700
  • 43c3aa75f6 Removed unused include from SimpleTexturedOpenGL CMakeLists.txt. Marc-Antoine Lortie 2020-03-30 17:58:26 -0400
  • fdbc307007 Removed unused header file in SimpleTexturedOpenGL sample. Marc-Antoine Lortie 2020-03-30 17:47:29 -0400
  • e445eba674 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev Kim Kulling 2020-03-30 21:53:46 +0200
  • 7f63a4b0d7 add terragen importer unittest. Kim Kulling 2020-03-30 21:53:25 +0200
  • a57edf2e99
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-30 21:52:12 +0200
  • 0d9bccbcca
    Merge pull request #3098 from assimp/kimkulling-patch-5 Kim Kulling 2020-03-30 21:51:51 +0200
  • 5e93b9ea8b Fixed bone splitting with excessive amount of bones with 0 weight Alexey Medvedev 2020-03-30 12:42:32 -0700
  • bb046a3f80
    fix typo Kim Kulling 2020-03-30 21:41:03 +0200
  • c2cbac979e
    Select releyase config Kim Kulling 2020-03-30 21:10:23 +0200
  • 6bae5e2a40
    Fix unittest execution Kim Kulling 2020-03-30 20:44:16 +0200
  • 6973aea6da fix compiler warnings. Kim Kulling 2020-03-30 20:41:39 +0200
  • 4c177ad72e fix possible warnings Kim Kulling 2020-03-30 20:33:43 +0200
  • d276044ad3 Merge remote-tracking branch 'upstream/master' RichardTea 2020-03-30 13:38:54 +0100
  • 419b0a1ddc
    Merge branch 'master' into optimized_bonelimits Ville Ruusutie 2020-03-29 21:48:38 +0300
  • 22d6b761e6
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-03-29 18:42:43 +0200
  • cdc580b947
    add windows build Kim Kulling 2020-03-29 18:39:55 +0200
  • 1593db4aff
    Merge branch 'master' into remove-UpdateAssimpLibsDebugSymbolsAndDLLs Marc-Antoine Lortie 2020-03-29 12:37:09 -0400