Commit Graph

  • 2194577429 fix regression escherstair 2019-09-18 08:25:24 +02:00
  • a5859dd3f4 Merge branch 'master' into fix-codacy-issues escherstair 2019-09-18 08:19:44 +02:00
  • c0ec5140ee init variable in initializer list escherstair 2019-09-18 08:18:52 +02:00
  • 6d4854f12c init variable in initializer list escherstair 2019-09-18 08:15:50 +02:00
  • 116dcce0ba init member in itilializer list escherstair 2019-09-18 08:04:46 +02:00
  • 3b608307c8 prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-18 08:00:58 +02:00
  • 8add762eac Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev Kim Kulling 2019-09-17 22:12:43 +02:00
  • f5dcd5060f add missing namespace." Kim Kulling 2019-09-17 22:11:58 +02:00
  • f7da7d8f67 Merge branch 'master' into kimkullig_dev Kim Kulling 2019-09-17 22:01:29 +02:00
  • 2edcf82f5a add missing include. Kim Kulling 2019-09-17 21:58:46 +02:00
  • 7f3b33d1c2 Merge pull request #2655 from PascalGilbraith/issue_2603 Kim Kulling 2019-09-16 17:23:08 +02:00
  • 8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon Kim Kulling 2019-09-15 19:25:37 +02:00
  • 7f7918957a Issue 2603 PascalGilbraith 2019-09-15 13:05:04 +01:00
  • 2be0eba1ab put one in comments because the file seems to be corrupt. Kim Kulling 2019-09-14 19:32:47 +02:00
  • ca0549558b closes https://github.com/assimp/assimp/issues/2653: introduce 2 tests to reproduce fbx-tokenize issue. Kim Kulling 2019-09-14 10:31:35 +02:00
  • 79056da4be closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch. Kim Kulling 2019-09-14 09:12:08 +02:00
  • ab3528f726 Merge pull request #2646 from RumbleballTheReal/master Kim Kulling 2019-09-14 01:07:22 +02:00
  • 818a5b633f Merge branch 'master' into master Kim Kulling 2019-09-13 22:23:49 +02:00
  • 446381e1ca Merge pull request #2647 from FabienPean/patch-1 Kim Kulling 2019-09-13 18:51:52 +02:00
  • cc7ba5288c Merge branch 'master' into patch-1 Kim Kulling 2019-09-13 14:35:29 +02:00
  • ee1ed502e7 Merge pull request #2654 from assimp/kimkulling-patch-4 Kim Kulling 2019-09-13 14:35:10 +02:00
  • a1254f067e closes https://github.com/assimp/assimp/issues/2627 - fix typo Kim Kulling 2019-09-13 12:05:29 +02:00
  • f985bcba83 Merge branch 'master' into patch-1 Kim Kulling 2019-09-13 11:21:57 +02:00
  • a642b1d51a Merge pull request #2649 from assimp/gltf_add_ortho_cam Kim Kulling 2019-09-12 21:40:01 +02:00
  • 4d2adf5bea Merge branch 'master' into gltf_add_ortho_cam Kim Kulling 2019-09-12 20:28:18 +02:00
  • 3bd63c006f Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam Kim Kulling 2019-09-12 20:27:53 +02:00
  • a25a1f0772 fix the build. Kim Kulling 2019-09-12 20:27:35 +02:00
  • 783f92e148 Merge branch 'master' into patch-1 Kim Kulling 2019-09-12 16:26:35 +02:00
  • 3069e2272d Merge pull request #2648 from rspencer01/master Kim Kulling 2019-09-12 16:26:00 +02:00
  • f10bd72100 Merge branch 'master' into gltf_add_ortho_cam Kim Kulling 2019-09-12 00:30:06 +02:00
  • f9c6fed190 Add a camera unittest. Kim Kulling 2019-09-11 22:34:53 +02:00
  • f67c18d41a introduce inline helper. Kim Kulling 2019-09-11 22:21:20 +02:00
  • 55b735b6c3 Merge branch 'master' into master Kim Kulling 2019-09-11 20:18:53 +02:00
  • 3cbcfd3cd8 Merge pull request #2650 from escherstair/fix-codacy-issues Kim Kulling 2019-09-11 20:15:41 +02:00
  • 7ff7a5d64e glTF: Try to remove duplicate code. kimkulling 2019-09-11 17:00:39 +02:00
  • 0307327999 Merge branch 'master' into fix-codacy-issues escherstair 2019-09-11 10:06:16 +02:00
  • 28d0300dbe Merge branch 'master' into gltf_add_ortho_cam Kim Kulling 2019-09-11 09:32:14 +02:00
  • d91eebf347 Add ortho camera. Kim Kulling 2019-09-10 22:13:54 +02:00
  • e1322f9178 Fix indentation error in python bindings Robert Spencer 2019-09-10 20:38:31 +01:00
  • b9cff2a019 prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-10 07:54:07 +02:00
  • 52d0170470 Update CMakeLists.txt Fabien Péan 2019-09-09 23:00:04 +02:00
  • 1899aaef6e Update Sample_SimpleOpenGL.c Fabien Péan 2019-09-09 22:44:58 +02:00
  • bfac0aae9c Merge branch 'master' into master Kim Kulling 2019-09-09 22:36:50 +02:00
  • d672ae21d0 Merge pull request #2640 from RevoluPowered/feature/implement-PBR-materials-fbx Kim Kulling 2019-09-09 22:36:22 +02:00
  • a16645f3f7 Update BUILDBINARIES_EXAMPLE.bat RumbleballTheReal 2019-09-09 21:20:44 +02:00
  • c19bd3d1d1 Merge branch 'master' into master RumbleballTheReal 2019-09-09 21:17:22 +02:00
  • b4fdc009e2 Merge branch 'master' into feature/implement-PBR-materials-fbx Kim Kulling 2019-09-09 20:51:20 +02:00
  • 66e5765387 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2019-09-09 20:22:48 +02:00
  • a0fb50146a Update BUILDBINARIES_EXAMPLE.bat RumbleballTheReal 2019-09-09 15:56:21 +02:00
  • 621a7a1abd Create BUILDBINARIES_EXAMPLE.bat RumbleballTheReal 2019-09-09 15:50:57 +02:00
  • db55ba4908 possible inefficient checking for 'tlist' emptiness escherstair 2019-09-09 15:00:28 +02:00
  • 027ee6ee00 Merge pull request #5 from escherstair/master escherstair 2019-09-09 14:58:27 +02:00
  • 03514a9237 Merge pull request #4 from assimp/master escherstair 2019-09-09 14:20:15 +02:00
  • c519a91233 Merge pull request #2644 from FabienPean/patch-1 Kim Kulling 2019-09-08 23:06:57 +02:00
  • 602b0cf0c2 Update Sample_SimpleOpenGL.c Kim Kulling 2019-09-08 21:03:08 +02:00
  • ddc26e1c46 Added maya stingray support for textures RevoluPowered 2019-09-08 18:17:40 +01:00
  • da97f1be79 Implemented basic PBR materials into assimp. RevoluPowered 2019-09-06 15:03:02 +01:00
  • 1b86de9d14 Fix Sample_SimpleOpenGL.c Fabien Péan 2019-09-08 19:15:57 +02:00
  • 3801b84ef9 Merge pull request #2639 from escherstair/fix-codacy-issues Kim Kulling 2019-09-08 16:04:00 +02:00
  • ad2dd2dc18 Merge branch 'master' into fix-codacy-issues Kim Kulling 2019-09-08 12:08:01 +02:00
  • a835afeb2b Merge pull request #2638 from RumbleballTheReal/master Kim Kulling 2019-09-07 21:00:28 +02:00
  • 5d8482dae6 Merge branch 'master' into master Kim Kulling 2019-09-07 18:53:26 +02:00
  • 86886cb2e4 Merge pull request #2643 from assimp/thomasbiang-fix_issue_joinIdenticalVertices_notNeeded Kim Kulling 2019-09-07 18:43:52 +02:00
  • f8bcd7cb40 Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded Kim Kulling 2019-09-07 10:02:20 +02:00
  • 945af4397b Merge branch 'thomasbiang-fix_issue_joinIdenticalVertices_notNeeded' Kim Kulling 2019-09-07 09:59:47 +02:00
  • 336ae0e55a Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded Kim Kulling 2019-09-07 09:58:07 +02:00
  • c1d4549d19 Merge pull request #2626 from muxanickms/crash_in_ai_mesh_desctuctor Kim Kulling 2019-09-07 09:31:47 +02:00
  • 3546403284 Merge branch 'master' into crash_in_ai_mesh_desctuctor Kim Kulling 2019-09-06 20:45:16 +02:00
  • 570b3838c9 Merge branch 'master' into fix-codacy-issues escherstair 2019-09-06 13:20:00 +02:00
  • 1503608aaa prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-06 11:31:07 +02:00
  • 91706a1f6e prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-06 11:29:52 +02:00
  • 1a8375f925 Merge pull request #2633 from rmccampbell/unicode_fix Kim Kulling 2019-09-06 11:28:57 +02:00
  • d177c722b1 prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-06 11:28:38 +02:00
  • eb8479a95e possible inefficient checking for 'tlist' emptiness escherstair 2019-09-06 11:19:27 +02:00
  • 6661e7047a Merge branch 'master' into unicode_fix Kim Kulling 2019-09-06 08:59:21 +02:00
  • 8fc625513e Merge pull request #1 from RumbleballTheReal/patch-1 RumbleballTheReal 2019-09-05 23:53:21 +02:00
  • 22bd047db5 Added VertexColors to FBX exporter (one channel) RumbleballTheReal 2019-09-05 23:44:54 +02:00
  • 9b897a8e8d Merge pull request #2634 from escherstair/fix-codacy-issues Kim Kulling 2019-09-05 21:11:32 +02:00
  • af26c090db Merge branch 'master' into fix-codacy-issues Kim Kulling 2019-09-05 19:50:31 +02:00
  • b271091c64 fix division by zero Mike Samsonov 2019-08-29 10:44:56 +01:00
  • 4029fe5e46 alloc-dealloc-mismatch Mike Samsonov 2019-08-28 20:12:46 +01:00
  • 9adc4e87fa alloc-dealloc-mismatch Mike Samsonov 2019-08-28 19:35:13 +01:00
  • 0324643cd5 Missing model files Mike Samsonov 2019-08-28 18:53:13 +01:00
  • 873a358ce4 A crash in the aiMesh descructor Mike Samsonov 2019-08-28 18:42:49 +01:00
  • 8ca9d2ed40 Merge branch 'master' into unicode_fix Kim Kulling 2019-09-04 17:47:45 +02:00
  • 893a0177ff Merge pull request #2624 from congard/master Kim Kulling 2019-09-04 16:31:01 +02:00
  • eb762e654e Removed WindowsStore checks Ryan McCampbell 2019-09-03 23:13:44 -04:00
  • a16906686f Fixed type conversion warnings Ryan McCampbell 2019-09-03 21:06:48 -04:00
  • 50820e48b9 Merge branch 'master' into fix-codacy-issues Kim Kulling 2019-09-03 21:54:59 +02:00
  • a8822a2b29 Cleaned up formatting in DefaultIOSystem.cpp Ryan McCampbell 2019-08-19 15:36:45 -04:00
  • 0685e415ad removed extra null character in Utf8ToWide and WideToUtf8 Ryan McCampbell 2019-08-19 12:00:01 -04:00
  • 6c65b5b549 Cleaned up unicode code and removed fixed-size buffers Ryan McCampbell 2019-07-09 02:17:45 -07:00
  • 727cf0c49f Fixed unicode on windows Ryan McCampbell 2019-07-08 23:21:57 -07:00
  • 4d9b350184 Update CMakeLists.txt Kim Kulling 2019-09-03 15:17:42 +02:00
  • 57e712c0a8 Merge branch 'master' into master Kim Kulling 2019-09-03 11:39:17 +02:00
  • 071504991a Update CMakeLists.txt Kim Kulling 2019-09-03 11:39:05 +02:00
  • c4ce8cec96 prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-03 08:02:56 +02:00
  • e317fbfbb6 prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-03 08:01:56 +02:00
  • bbb1f6a1dc prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-03 08:01:05 +02:00
  • ceacad237f prefer prefix ++/-- operators for non-primitive types escherstair 2019-09-03 08:00:12 +02:00