Commit Graph

  • 76908002c6 Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-02-18 18:25:17 +0200
  • d0922230a9 fixed the = default on the destructor iamAdrianIusca 2020-02-18 18:24:52 +0200
  • ba925e8860
    Merge branch 'master' into master Justin Carpentier 2020-02-18 17:23:02 +0100
  • 0811a69dab
    Merge branch 'master' into master Adrian Iusca 2020-02-18 18:02:25 +0200
  • 485e474a0c Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-02-18 18:02:03 +0200
  • a65bac27e9 fixed the make_unique iamAdrianIusca 2020-02-18 18:01:53 +0200
  • fb3c3048a5 Merge branch 'master' into enable_vs_warning_all Kim Kulling 2020-02-18 14:47:38 +0100
  • 6e13381bdb next warnings. Kim Kulling 2020-02-18 14:41:19 +0100
  • 10c84c9226
    Merge pull request #3015 from malortie/fix-simpletexturedopengl-sample Kim Kulling 2020-02-18 14:24:26 +0100
  • 51ebe1abfb
    Merge branch 'master' into fix-simpletexturedopengl-sample Kim Kulling 2020-02-17 23:22:06 +0100
  • 221e56769f
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-02-16 19:56:26 +0100
  • 92da00329f
    Update irrArray.h Kim Kulling 2020-02-16 18:10:52 +0100
  • 22118dff1d Merge branch 'master' into enable_vs_warning_all Kim Kulling 2020-02-16 15:37:48 +0100
  • c2bfbdacf4 fix more warnings. Kim Kulling 2020-02-16 15:37:20 +0100
  • 919da48cdc
    Merge pull request #3016 from assimp/kimkulling-patch-1-1 Kim Kulling 2020-02-16 15:36:58 +0100
  • d75f46280d
    Update irrString.h Kim Kulling 2020-02-16 15:32:29 +0100
  • ec3a5620d0
    Update AssxmlExporter.cpp Kim Kulling 2020-02-16 15:04:18 +0100
  • ada4f51d5b
    Merge branch 'master' into kimkulling_dev Kim Kulling 2020-02-16 13:10:41 +0100
  • b3d894ee73
    Update CMakeLists.txt Kim Kulling 2020-02-16 13:06:38 +0100
  • eb8abfa02c
    Update .clang-format Kim Kulling 2020-02-16 12:37:46 +0100
  • d9042e4609 Fixed SimpleTexturedOpenGL sample. Marc-Antoine Lortie 2020-02-15 18:02:12 -0500
  • 4f44b4d25f
    Merge branch 'master' into master Adrian Iusca 2020-02-15 23:32:40 +0200
  • 024b5e60bc Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-02-15 23:29:26 +0200
  • 5c99d6a864 very small changes iamAdrianIusca 2020-02-15 23:29:04 +0200
  • 081e88bd57
    Merge branch 'master' into issue_2804 Kim Kulling 2020-02-15 20:59:50 +0100
  • be4fe131d5 Made changes to write compiled binaries to a common directory. Marc-Antoine Lortie 2020-02-15 13:10:11 -0500
  • 4a3ecbea14 disable arning for irrXml. Kim Kulling 2020-02-15 11:43:35 +0100
  • b072614fad disable warnings for zib. Kim Kulling 2020-02-15 11:40:26 +0100
  • a0000e5be4
    Merge pull request #3003 from iamAdrianIusca/master Kim Kulling 2020-02-15 10:55:26 +0100
  • 00a104efde
    Merge branch 'master' into master Kim Kulling 2020-02-14 20:58:13 +0100
  • 693aa5c1d6 Enable all warnings for Visual Studio. Kim Kulling 2020-02-14 20:50:17 +0100
  • 82beb35b78
    Merge pull request #3000 from malortie/search-invalid-textures-missing-texture-types Kim Kulling 2020-02-14 20:05:58 +0100
  • bdd5e52176
    Merge branch 'master' into search-invalid-textures-missing-texture-types Kim Kulling 2020-02-14 18:04:30 +0100
  • 1e828cb8bb
    pkg-config: fix include path Justin Carpentier 2020-02-14 15:57:06 +0100
  • 1473c6616b
    Merge branch 'master' into master Kim Kulling 2020-02-14 12:56:14 +0100
  • f7abd61cca
    Merge pull request #2986 from bubba/gltf-camera-pos Kim Kulling 2020-02-14 12:55:36 +0100
  • d662b25b17
    Merge branch 'master' into master Adrian Iusca 2020-02-14 13:40:15 +0200
  • d04df3e7c5 A bug when importing multiple gltf files Inho Lee 2020-02-14 08:41:55 +0100
  • 523e6c9f73
    Merge branch 'master' into gltf-camera-pos Kim Kulling 2020-02-14 08:21:54 +0100
  • d5b7ecd2ec
    Merge pull request #2995 from runforu/master Kim Kulling 2020-02-14 08:21:29 +0100
  • b62bd38c71 Fix: GLTF animation works on RTS not matrix; fix matrix related bug. Hui.Du 2020-02-10 02:03:26 +0000
  • 56a71f22e1
    Merge branch 'master' into master Adrian Iusca 2020-02-14 01:04:46 +0200
  • 62815b7477
    Merge branch 'master' into issue_3007 Kim Kulling 2020-02-13 21:41:19 +0100
  • a4868a9530
    Merge pull request #2985 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix Kim Kulling 2020-02-13 21:40:55 +0100
  • 3c00d7eedb closes https://github.com/assimp/assimp/issues/3007: remove named ELSE and ENDIF statements from cmakefiles.W kimkulling 2020-02-13 21:29:38 +0100
  • 25feb77982 more minor changes iamAdrianIusca 2020-02-13 00:38:56 +0200
  • 6f1870681b reduced the scope of iStep variable iamAdrianIusca 2020-02-13 00:27:30 +0200
  • 24cdb1f221 revert small change iamAdrianIusca 2020-02-13 00:21:04 +0200
  • 6f53e8b43b
    Merge branch 'master' into master Adrian Iusca 2020-02-13 00:14:20 +0200
  • fc4dd6455a minor code improvements for the obj code iamAdrianIusca 2020-02-13 00:10:07 +0200
  • f5af791633
    Merge branch 'master' into FBXMeshGeometry_checksizes_fix Kim Kulling 2020-02-12 17:58:00 +0100
  • 58b9dcbdc7
    Merge pull request #2973 from bztsrc/master Kim Kulling 2020-02-12 17:22:46 +0100
  • 5a43afc952 use spaces. kimkulling 2020-02-12 16:11:26 +0100
  • e8fd4dc876 Install clang format fr travis build kkulling 2020-02-12 16:05:49 +0100
  • 47fc3f2627
    Update M3DImporter.cpp Kim Kulling 2020-02-12 14:54:00 +0100
  • 1c13c793f0
    Merge branch 'master' into master Kim Kulling 2020-02-11 22:00:22 +0100
  • aed762acd7
    Merge pull request #2971 from ms-maxvollmer/FBXParser_check_inputlength_fix Kim Kulling 2020-02-11 21:57:38 +0100
  • 50334086cf Added missing texture types when searching for invalid textures. Marc-Antoine Lortie 2020-02-11 11:42:13 -0500
  • 58990d4e3f
    Update FBXParser.cpp Kim Kulling 2020-02-10 23:59:52 +0100
  • 5e979d72c9
    Merge branch 'master' into FBXParser_check_inputlength_fix Kim Kulling 2020-02-10 23:59:13 +0100
  • c722061f18
    Merge pull request #2969 from LoicFr/master Kim Kulling 2020-02-10 23:58:40 +0100
  • 471f9b23c9
    Merge branch 'master' into master Kim Kulling 2020-02-10 21:37:01 +0100
  • c6000db3be
    Merge pull request #2994 from iamAdrianIusca/master Kim Kulling 2020-02-10 21:07:52 +0100
  • d38e541e89
    Merge branch 'master' into master Kim Kulling 2020-02-09 20:43:12 +0100
  • 91633dc437
    Merge pull request #2987 from Frooxius/master Kim Kulling 2020-02-09 20:42:30 +0100
  • ca08cbcb0c - don't include HunterGate.cmake if you don't enable HUNTER package manager - don't check for DirectX if you don't build the assimp tools or samples iamAdrianIusca 2020-02-09 20:31:06 +0200
  • 8fd053315c
    Update ArmaturePopulate.cpp Kim Kulling 2020-02-09 11:14:42 +0100
  • 407c550240
    Merge branch 'master' into master Kim Kulling 2020-02-09 11:05:35 +0100
  • 5a674bb464
    Merge pull request #2989 from malortie/multiple-texture-type-to-string-definitions Kim Kulling 2020-02-09 11:05:08 +0100
  • 95a7772b5a
    Merge branch 'master' into multiple-texture-type-to-string-definitions Marc-Antoine Lortie 2020-02-07 17:37:10 -0500
  • af9705e3d1
    Merge branch 'master' into FBXParser_check_inputlength_fix Kim Kulling 2020-02-07 11:52:00 +0100
  • 97a6d80cb1
    Merge pull request #2990 from assimp/kimkulling-sponoring-update-1 Kim Kulling 2020-02-07 11:51:37 +0100
  • d3a70c73c4
    Update FUNDING.yml Kim Kulling 2020-02-07 10:58:56 +0100
  • acf57bdb13
    Merge branch 'master' into master Tomas Mariancik 2020-02-06 22:58:19 +0100
  • 8c09cd2ef3 Fixed TextureTypeToString defined multiple times. Marc-Antoine Lortie 2020-02-06 13:19:01 -0500
  • 355131e261
    Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2 Kim Kulling 2020-02-06 17:24:01 +0100
  • b33272b1c8
    Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 Kim Kulling 2020-02-06 14:39:09 +0100
  • 29603128f4 Fixed invalid armature node population when there's mesh on a node with the same name as the bone Frooxius 2020-02-06 10:28:38 +0100
  • cb02e2fc65
    Merge pull request #4 from assimp/master Tomas Mariancik 2020-02-06 08:26:57 +0100
  • 979153522c xml-migration: migration of XGLImporter. Kim Kulling 2020-02-05 22:51:39 +0100
  • 18c01a023c Use the translation matrix in gltf2 cameras for aiCamera.mPosition Luke Lau 2020-02-05 21:24:54 +0000
  • fa60ae2885
    Merge pull request #2974 from malortie/rename-writedumb-to-writedump Kim Kulling 2020-02-05 17:42:55 +0100
  • 7047d05bf0
    Merge branch 'master' into FBXMeshGeometry_checksizes_fix Max Vollmer (Microsoft Havok) 2020-02-05 14:43:03 +0000
  • 8af0229e0d In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count Max Vollmer 2020-02-05 14:40:35 +0000
  • f00256d185
    Merge branch 'master' into rename-writedumb-to-writedump Kim Kulling 2020-02-05 13:58:09 +0100
  • f7c59ace44
    Merge pull request #2984 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix Kim Kulling 2020-02-05 13:57:40 +0100
  • eb1d25631b
    Merge branch 'master' into FBXMeshGeometry_checksizes_fix Max Vollmer (Microsoft Havok) 2020-02-05 11:12:57 +0000
  • ec024085ab Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix Max Vollmer 2020-02-05 11:08:00 +0000
  • cb55e2658d Removed unnecessary checks that may result in false positives rejecting valid models Max Vollmer 2020-02-05 11:07:39 +0000
  • 1a8d5667b6 xml-migration: migrate shared code from irr-loader. Kim Kulling 2020-02-04 20:47:20 +0100
  • f4406d7a84
    Merge branch 'master' into issue_2804 Kim Kulling 2020-02-03 21:26:47 +0100
  • c9244a4ae3
    Merge pull request #2976 from hbina/fix_clang_warnings Kim Kulling 2020-02-03 21:20:12 +0100
  • bd2ffc8d58 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml Kim Kulling 2020-02-03 21:19:30 +0100
  • c1fcee9c5a XMl-Migration: Migration of IrrMesh. Kim Kulling 2020-02-03 21:19:03 +0100
  • ad286a8ab1
    Merge branch 'master' into fix_clang_warnings Kim Kulling 2020-02-03 19:07:02 +0100
  • 8e009c3d0c
    Update MDLLoader.cpp Kim Kulling 2020-02-03 19:06:36 +0100
  • c0dc3b3f58
    Merge pull request #2978 from malortie/scene-combiner-memory-leak Kim Kulling 2020-02-03 19:02:36 +0100
  • 2d5c28ac46
    Merge branch 'master' into scene-combiner-memory-leak Kim Kulling 2020-02-02 20:43:52 +0100
  • 99175e3eaf
    Merge branch 'master' into master Kim Kulling 2020-02-01 19:26:52 +0100
  • 5eb040c744
    Merge pull request #2970 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix Kim Kulling 2020-02-01 19:24:54 +0100