Kim Kulling
|
1c3f734cd6
|
Merge branch 'master' into issue_2693
|
2019-10-08 20:25:58 +02:00 |
|
Kim Kulling
|
165b36c1fc
|
Merge pull request #2692 from escherstair/add_VS2013_VS2019
Add AppVeyor build VS2019
|
2019-10-07 15:09:12 +02:00 |
escherstair
|
c63f5b2f9e
|
removed unused lines
|
2019-10-07 11:38:45 +02:00 |
|
escherstair
|
128602f29b
|
fixed fatal error
|
2019-10-07 10:12:40 +02:00 |
|
escherstair
|
97e060c428
|
added CMAKE_GENERATOR_PLATFORM
|
2019-10-07 09:34:02 +02:00 |
|
Kim Kulling
|
ecd413c86c
|
Update utVersion.cpp
Fix the unittests as well.
|
2019-10-06 20:19:59 +02:00 |
|
Kim Kulling
|
c443092c44
|
Merge branch 'master' into add_VS2013_VS2019
|
2019-10-06 11:12:15 +02:00 |
|
Kim Kulling
|
78cfec41ec
|
Merge branch 'master' into issue_2693
|
2019-10-06 11:11:22 +02:00 |
|
Kim Kulling
|
d2476e9cda
|
Merge pull request #2675 from vcebollada/gltf_mesh_morph_animations
gltf2.0 importer - Support for mesh morph animations added.
|
2019-10-06 09:08:24 +02:00 |
Engin Manap
|
afec2e2c49
|
Fix #2693 aiGetVersionMajor return wrong version
The 2 constants MinorVersion and MajorVersion are updated for 5.0
|
2019-10-05 19:23:02 +02:00 |
|
escherstair
|
f2a70ad10c
|
remove VS2013 build
|
2019-10-02 10:43:06 +02:00 |
|
escherstair
|
d0e8f5ca32
|
add cmake generators for VS2013 and VS2019
|
2019-10-02 10:30:50 +02:00 |
|
escherstair
|
19fddb0861
|
Merge branch 'master' into add_VS2013_VS2019
|
2019-10-02 10:24:52 +02:00 |
|
escherstair
|
9c326e6989
|
Add AppVeyor build VS2013 and VS2019
|
2019-10-02 10:21:56 +02:00 |
vcebollada
|
6550b1df61
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-10-01 08:04:46 +01:00 |
|
Kim Kulling
|
09d80ff478
|
Merge pull request #2666 from theakman2/issue_2662
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662)
|
2019-09-30 23:10:24 +02:00 |
|
Kim Kulling
|
ec74f6603b
|
Merge branch 'master' into issue_2662
|
2019-09-30 22:10:45 +02:00 |
|
vcebollada
|
42ff3f1633
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-09-30 13:38:33 +01:00 |
|
Kim Kulling
|
c480b65291
|
Merge pull request #2680 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
|
2019-09-29 14:36:18 +02:00 |
Theak
|
7a8b7ba88d
|
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
|
2019-09-29 10:09:53 +01:00 |
grdowns
|
8101bc6a77
|
Add vcpkg installation instructions
|
2019-09-26 17:46:26 -07:00 |
|
vcebollada
|
5018af995b
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-09-26 11:33:33 +01:00 |
|
Kim Kulling
|
2757297b4f
|
Merge branch 'master' into issue_2662
|
2019-09-26 09:55:16 +02:00 |
|
Kim Kulling
|
0e85872951
|
Merge pull request #2663 from thomasbiang/fix-multi-uvset-coord
fix issue textureCoords are messed up for multiple uvset
|
2019-09-26 08:55:47 +02:00 |
|
vcebollada
|
8ca39ade6a
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-09-25 16:16:32 +01:00 |
|
Kim Kulling
|
6e75d7a839
|
Merge branch 'master' into fix-multi-uvset-coord
|
2019-09-25 16:57:24 +02:00 |
|
Kim Kulling
|
a75fc4563a
|
Merge pull request #2669 from theakman2/issue_2668
Fix: Mismatched new/free in gltf2 importer (fixes #2668)
|
2019-09-25 16:56:52 +02:00 |
|
Victor Cebollada
|
e0fee3d87b
|
gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
|
2019-09-25 09:58:23 +01:00 |
|
Kim Kulling
|
12a101124a
|
Merge branch 'master' into issue_2668
|
2019-09-24 19:29:40 +02:00 |
|
Kim Kulling
|
2d2889f73f
|
Merge pull request #2667 from theakman2/issue_2661
Fix: memory leak in gltf2 importer (fixes #2661)
|
2019-09-24 19:28:59 +02:00 |
Alan
|
b8e53c967f
|
Merge branch 'master' into issue_2668
|
2019-09-24 02:21:59 +01:00 |
|
Alan
|
d3a79d0cc2
|
Merge branch 'master' into issue_2661
|
2019-09-24 02:21:19 +01:00 |
|
Alan
|
17f55aa67e
|
Merge branch 'master' into issue_2662
|
2019-09-24 02:20:47 +01:00 |
|
Kim Kulling
|
c07793149c
|
Merge pull request #2671 from JenniferBuehler/master
Fix UV texture coords generation along Z Axis
|
2019-09-23 17:00:50 +02:00 |
|
Kim Kulling
|
3b2e0ebfc7
|
Merge branch 'master' into issue_2661
|
2019-09-23 16:59:28 +02:00 |
Jennifer Buehler
|
aa47a028c8
|
Fix UV texture coords generation along Z Axis
|
2019-09-23 11:22:20 +02:00 |
|
Kim Kulling
|
74ac8676e2
|
Merge pull request #2670 from assimp/fix_static_code_analysis
Use correct escape sequence for unsigned.
|
2019-09-22 15:56:37 +02:00 |
Kim Kulling
|
ab3c17419e
|
fix warning
|
2019-09-22 12:27:44 +02:00 |
|
Theak
|
61fa619f92
|
Fix: Mismatched new/free in gltf2 importer (fixes #2668)
|
2019-09-22 10:24:30 +01:00 |
|
Theak
|
720ac4846b
|
Fix: memory leak in gltf2 importer (fixes #2661)
|
2019-09-22 10:12:19 +01:00 |
|
Kim Kulling
|
87004aa70c
|
Merge pull request #2664 from assimp/new_aistringsize
Ensure that the aiString lenght is 4 bytes independent which platform…
|
2019-09-22 11:09:00 +02:00 |
|
Theak
|
0e6478c0d4
|
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662)
|
2019-09-22 09:59:58 +01:00 |
|
Kim Kulling
|
94c488d7ea
|
fix compiler warnings.
|
2019-09-22 10:15:44 +02:00 |
|
Kim Kulling
|
ef54a00fc4
|
Use correct escape sequence for unsigned.
|
2019-09-22 09:12:37 +02:00 |
|
Kim Kulling
|
06eb199704
|
Merge branch 'master' into new_aistringsize
|
2019-09-21 22:31:48 +02:00 |
|
Kim Kulling
|
aeecc17482
|
Merge pull request #2665 from assimp/move_qt_viewer_to_new_repo
remove the qt-viewer from the build system.
|
2019-09-21 22:31:31 +02:00 |
|
Kim Kulling
|
13586eb073
|
remove the qt-viewer from the build system.
|
2019-09-21 18:02:37 +02:00 |
|
Kim Kulling
|
69087abc56
|
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
|
2019-09-21 16:36:22 +02:00 |
ywang
|
a4092a3234
|
correct uvset index
|
2019-09-20 17:53:15 -07:00 |
|
Kim Kulling
|
83df4f4104
|
Merge pull request #2658 from escherstair/fix-codacy-issues
Fix codacy issues - part #5
|
2019-09-19 11:53:58 +02:00 |