Commit Graph

  • aa9b364086
    Update and rename windows-64-bits-minsizerel.yml to win64-minsizerel.yml Ricardo Reis 2020-03-01 15:45:06 -0300
  • 7f5a9469aa
    Rename default.yml to windows-64-bits-minsizerel.yml Ricardo Reis 2020-03-01 15:43:03 -0300
  • 1d391592bf
    Update default.yml Ricardo Reis 2020-03-01 15:32:10 -0300
  • 4f2e90811f
    Update default.yml Ricardo Reis 2020-03-01 12:07:40 -0300
  • 5e78c8891d
    Update default.yml Ricardo Reis 2020-03-01 12:03:23 -0300
  • 920535165d next fixed warnings Kim Kulling 2020-03-01 13:15:45 +0100
  • 66288df49b small change iamAdrianIusca 2020-03-01 12:24:34 +0200
  • ffaa3629d8 back with the emplace_back iamAdrianIusca 2020-03-01 11:24:58 +0200
  • ec61318443
    Merge branch 'master' into master Adrian Iusca 2020-03-01 11:24:12 +0200
  • 0d8434ed34 fix iamAdrianIusca 2020-03-01 11:23:55 +0200
  • 2917ab04b7 fix iamAdrianIusca 2020-03-01 11:22:44 +0200
  • 89ca66f300 fix iamAdrianIusca 2020-03-01 11:21:53 +0200
  • 1f4b99479d fix iamAdrianIusca 2020-03-01 11:20:55 +0200
  • 3bef9382bb Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-03-01 11:12:46 +0200
  • aca6aaf35d small changes iamAdrianIusca 2020-03-01 11:12:37 +0200
  • 2e89600441
    Update default.yml Ricardo Reis 2020-02-29 23:24:50 -0300
  • 772774495c
    Merge pull request #3040 from Nimer-88/split_by_bone_count_infinite_loop Kim Kulling 2020-02-29 20:19:43 +0100
  • f01a1e5641
    Update default.yml Ricardo Reis 2020-02-29 10:06:21 -0300
  • 42d2d5e404
    Update default.yml Ricardo Reis 2020-02-29 09:21:58 -0300
  • 81cc5254d6
    Update default.yml Ricardo Reis 2020-02-29 09:16:50 -0300
  • cc167e2097
    Update default.yml Ricardo Reis 2020-02-29 09:12:47 -0300
  • 8936691530
    Update and rename ccpp.yml to default.yml Ricardo Reis 2020-02-29 08:47:43 -0300
  • 710dbba52d Trimmed trailing whitespaces Sebastian Matusik 2020-02-28 19:19:10 -0800
  • 496fcd35c1 Trimmed trailing whitespaces Sebastian Matusik 2020-02-28 19:17:53 -0800
  • 5f35d62d61 Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0 Sebastian Matusik 2020-02-28 18:41:29 -0800
  • 22311883ce Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop Sebastian Matusik 2020-02-28 18:39:40 -0800
  • f343d3eec2
    Merge pull request #3022 from iamAdrianIusca/master Kim Kulling 2020-02-28 22:52:59 +0100
  • f372bce9e1
    Create .gitignore Ricardo Reis 2020-02-26 21:55:38 -0300
  • 03182c21b8 xml-migration amf - next steps. Kim Kulling 2020-02-26 22:19:42 +0100
  • 440629f1d2
    Merge branch 'master' into master Adrian Iusca 2020-02-26 20:27:52 +0200
  • c5aa817bda
    Merge branch 'master' into sample-simpleopengl-minor-improvements Marc-Antoine Lortie 2020-02-26 12:44:25 -0500
  • 5eca30e274
    Merge pull request #3010 from jcarpent/master Kim Kulling 2020-02-26 18:35:46 +0100
  • ed5aab9495 Fixed and changed a few things. Marc-Antoine Lortie 2020-02-26 12:19:06 -0500
  • a01b049ca3
    Update ccpp.yml Ricardo Reis 2020-02-26 12:30:59 -0300
  • 48d8fddb29
    Update ccpp.yml Ricardo Reis 2020-02-26 12:20:31 -0300
  • bf1ba0295b
    Update ccpp.yml Ricardo Reis 2020-02-26 11:57:51 -0300
  • 62d1abdd85
    Update ccpp.yml Ricardo Reis 2020-02-26 11:52:44 -0300
  • f8aeb8ed6f
    Update ccpp.yml Ricardo Reis 2020-02-26 11:50:00 -0300
  • 3af7ee0bb4
    Update ccpp.yml Ricardo Reis 2020-02-26 11:49:19 -0300
  • b6225b5e36
    Update ccpp.yml Ricardo Reis 2020-02-26 11:38:20 -0300
  • 9dcc71efad
    Update ccpp.yml Ricardo Reis 2020-02-26 11:37:37 -0300
  • 205ae8fd48
    Update ccpp.yml Ricardo Reis 2020-02-26 11:34:10 -0300
  • 5596b20c5e
    Update ccpp.yml Ricardo Reis 2020-02-26 11:33:17 -0300
  • 3c081f5f70 [RFC] cmake: targets: check lib or lib64 path Nikita Shubin 2020-02-26 17:06:22 +0300
  • a3307cab9e
    Update ccpp.yml Ricardo Reis 2020-02-26 11:03:10 -0300
  • d129350336
    Create ccpp.yml Ricardo Reis 2020-02-26 11:00:44 -0300
  • 4182d6fb60 cmake: double quotes around the <path> Nikita Shubin 2020-02-26 16:24:34 +0300
  • 957abaa15a Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view. Marc-Antoine Lortie 2020-02-26 08:00:49 -0500
  • 919ae489fc
    Merge branch 'master' into master Adrian Iusca 2020-02-25 23:32:31 +0200
  • 100a7a7c11
    Merge branch 'master' into master Kim Kulling 2020-02-25 20:51:17 +0100
  • 55f9644bc4
    Merge branch 'master' into master Ricardo Reis 2020-02-25 16:49:39 -0300
  • c5aa7cceee
    Merge pull request #3024 from malortie/remove-else-endif-constructs-cmake-files Kim Kulling 2020-02-25 20:44:10 +0100
  • 96dbbab123 Merge branch 'master' of https://github.com/rickomax/assimp rickomax 2020-02-25 15:40:50 -0300
  • df6461e80d Update FBXMaterial.cpp rickomax 2020-02-25 15:40:34 -0300
  • d893207dbf
    Merge branch 'master' into master Ricardo Reis 2020-02-25 15:02:33 -0300
  • e0f753410b Update FBXMaterial.cpp rickomax 2020-02-25 13:08:50 -0300
  • 9cba7238a7 Update FBXMaterial.cpp rickomax 2020-02-25 12:34:18 -0300
  • 89cb6d6982 Update FBXMaterial.cpp rickomax 2020-02-25 11:44:56 -0300
  • ce66907932 Merge branch 'master' of https://github.com/rickomax/assimp rickomax 2020-02-25 09:45:44 -0300
  • b6a2c40675 Updated zip rickomax 2020-02-25 09:39:43 -0300
  • 1c1b02409d
    Updated zip Ricardo Reis 2020-02-25 09:19:20 -0300
  • 7405031f78 Update FBXMaterial.cpp rickomax 2020-02-25 08:54:12 -0300
  • e56def7585 Fix indentation. Paul Arden 2020-02-25 14:52:59 +1100
  • ae50c4ebdf Add support for orthographic camera information and use in glTF2 importer. Fixes #3030. Paul Arden 2020-02-25 14:45:00 +1100
  • fb5b01958a Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028 Paul Arden 2020-02-25 11:03:07 +1100
  • be391a3b66
    Merge pull request #13 from assimp/master ardenpm 2020-02-25 10:39:49 +1100
  • e4b2fd246d
    Merge branch 'master' into remove-else-endif-constructs-cmake-files Kim Kulling 2020-02-24 20:08:17 +0100
  • 28f4b95ff5
    Merge branch 'master' into master Adrian Iusca 2020-02-24 21:05:51 +0200
  • 824a412239
    Merge pull request #3009 from inhosens/master Kim Kulling 2020-02-24 20:05:19 +0100
  • 67df988694 Fixed FBX properties/test rickomax 2020-02-24 15:07:57 -0300
  • f1f924aef3 Shinness is not specular. rickomax 2020-02-24 13:48:25 -0300
  • e36dc18db7 Added string-char parameter to getNextDataLine to avoid recognizing the part of a path as a line-break on OBJ parser rickomax 2020-02-24 13:39:10 -0300
  • 34bdc5968c Update FBXMaterial.cpp rickomax 2020-02-24 11:50:34 -0300
  • 1f4a5ddc4f Update FBXMaterial.cpp rickomax 2020-02-24 11:13:15 -0300
  • 9fe28f662b Initialization vars fix rickomax 2020-02-24 11:08:54 -0300
  • d956db7fb2 CopyFrom Fix 2 rickomax 2020-02-24 11:01:59 -0300
  • 0eb5f48ccb CopyFrom fix rickomax 2020-02-24 10:48:26 -0300
  • 5e21dc578f Fixes rickomax 2020-02-24 10:43:05 -0300
  • f9d3f93c76 TriLib changes rickomax 2020-02-23 14:14:29 -0300
  • edfaaed56f Removed uneeded expression in else() and endif() constructs. Marc-Antoine Lortie 2020-02-23 07:09:35 -0500
  • 55e9171e1f
    Merge branch 'master' into master Kim Kulling 2020-02-22 21:13:33 +0100
  • 344170469c
    Merge branch 'master' into master Adrian Iusca 2020-02-22 22:04:48 +0200
  • 55eb89d476
    Merge pull request #3013 from malortie/common-directory-for-compiled-binaries Kim Kulling 2020-02-22 21:01:56 +0100
  • 2d382c5e76
    Merge branch 'master' into common-directory-for-compiled-binaries Kim Kulling 2020-02-22 09:05:28 +0100
  • f3c89b0bd7
    Merge branch 'master' into master Adrian Iusca 2020-02-21 20:23:42 +0200
  • 4e414eb4ef Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-02-21 20:17:49 +0200
  • f28b087d16 small improvements in the CMakeLists.txt file iamAdrianIusca 2020-02-21 20:17:38 +0200
  • 3f5136b7b2
    Merge branch 'master' into master Kim Kulling 2020-02-19 21:52:57 +0100
  • 848922feae
    Merge pull request #3014 from iamAdrianIusca/master Kim Kulling 2020-02-19 21:47:33 +0100
  • 93d1586f44
    Merge branch 'master' into master Adrian Iusca 2020-02-19 21:31:24 +0200
  • bc3ed5f702
    Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks Kim Kulling 2020-02-19 20:13:02 +0100
  • 4d27fccd0b Fixed memory leaks in SimpleTexturedOpenGL sample. Marc-Antoine Lortie 2020-02-19 13:17:45 -0500
  • 93de396373
    Merge branch 'master' into master Adrian Iusca 2020-02-19 16:03:33 +0200
  • 8639bbabc7
    Merge pull request #3020 from assimp/kimkulling-clangformat Kim Kulling 2020-02-19 12:35:09 +0100
  • 8d6d8e2e38
    Update .clang-format Kim Kulling 2020-02-19 10:42:30 +0100
  • 4de0237167 small fix iamAdrianIusca 2020-02-18 21:55:35 +0200
  • a5524ffcd9 more changes iamAdrianIusca 2020-02-18 19:02:14 +0200
  • ad52c5c5f6 .clear in destructor is redundant iamAdrianIusca 2020-02-18 18:56:09 +0200
  • bf85fc1386 small changes iamAdrianIusca 2020-02-18 18:50:48 +0200
  • 016c0a8665 small changes iamAdrianIusca 2020-02-18 18:42:59 +0200