Commit Graph

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