d14249e0ee
Merge branch 'master' into kimkulling-patch-1
2020-01-11 11:59:16 +01:00
7e140ff912
Add MD2 importer unit tests
2020-01-10 13:50:16 +02:00
e5db5e84e6
Merge pull request #2875 from turol/fix-models
...
Revert more broken test models to working versions
2020-01-10 10:39:47 +02:00
625357685c
Update EmbedTexturesProcess.cpp
...
closes https://github.com/assimp/assimp/issues/2874 : fix leaked texture buffer.
2020-01-09 22:04:46 +01:00
d372d28d2e
Revert more broken test models to working versions
...
Was broken by a8a1ca9894Closes #2861
2020-01-09 21:56:39 +02:00
cacab6bf0b
Merge pull request #2868 from assimp/kimkulling-doc-patch
...
Update Readme.md
2020-01-09 20:06:34 +01:00
2e6ebc40d4
Merge branch 'master' into kimkulling-doc-patch
2020-01-08 20:23:14 +01:00
7b17cb8ddb
Merge pull request #2870 from turol/fix-amf-test
...
Revert 3_bananas.amf.7z to working version
2020-01-08 20:43:03 +02:00
a69492753a
Merge branch 'master' into fix-amf-test
2020-01-08 14:29:41 +01:00
df96f5a822
Merge pull request #2866 from assimp/kimkulling-patch-1
...
Update glTF2Importer.cpp
2020-01-08 14:29:13 +01:00
7b7100a94b
Revert 3_bananas.amf.7z to working version
...
Was broken by a8a1ca9894Closes #2857
2020-01-08 14:20:56 +02:00
88bb0bad6a
Merge branch 'master' into kimkulling-patch-1
2020-01-08 10:31:44 +01:00
001c66ec57
Merge pull request #2867 from assimp/kimkulling-issue_2806
...
Update VertexTriangleAdjacency.cpp
2020-01-08 10:31:13 +01:00
346ab9af35
Update Readme.md
...
Fix the assimp.net link, old repo was broken.
2020-01-08 08:35:06 +01:00
37210372a8
Update VertexTriangleAdjacency.cpp
...
closes https://github.com/assimp/assimp/issues/2806 : calculate corret number of vertices.
2020-01-07 21:26:37 +01:00
9b8f2970c8
Update glTF2Importer.cpp
...
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
2020-01-07 21:22:41 +01:00
a62c44227a
Merge pull request #2865 from LoicFr/master
...
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
2020-01-07 21:19:27 +01:00
f04573984a
Update glTF2Importer.cpp
...
Remove dead code
2020-01-07 20:41:37 +01:00
e3988cc066
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
2020-01-07 16:20:33 +01:00
acb8addf7d
Merge pull request #2863 from Dunni/user/dunnia/ply-export-fix
...
Fix PlyExporter to support faces with 0 vertices
2020-01-06 21:14:59 +01:00
52a7be775d
Fix PlyExporter to support faces with 0 vertices
2020-01-06 14:57:59 +01:00
185c2fde3c
Merge pull request #2855 from felipeek/fix/collada-combining-animations
...
fix: Don't combine Collada animations when channels are shared
2020-01-04 16:57:14 +01:00
cce77345e5
Update ColladaHelper.h
...
Add missing include.
2020-01-04 11:57:26 +01:00
12ee1a6776
Merge branch 'master' into fix/collada-combining-animations
2020-01-03 12:13:52 +01:00
a01d7c4048
Merge pull request #2820 from RichardTea/collada_modeller_metadata
...
Collada and glTF modeller metadata
2020-01-02 20:40:41 +01:00
ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata
2020-01-02 13:25:04 +00:00
4e50b05b85
Fix off-by-one error
2020-01-02 13:24:50 +00:00
ab50b5e181
Fix typo, fix GCC build
2020-01-02 13:02:40 +00:00
d11af753f2
Fix Codacity warnings, test Exporter metadata
...
Pass std::string around instead as need to create one anyway.
Use CamelCase version to avoid caseSensiTivity issues
as will usually want the camelcase edition anyway.
Not UTF-8 but the standard XML tags are ASCII anyway
2020-01-02 12:35:00 +00:00
6bdda42cd0
Merge branch 'master' into fix/collada-combining-animations
2020-01-02 00:40:03 +01:00
2620f4a536
Merge pull request #2858 from malortie/uv-coordinates-swapped-twice
...
Fixed UV coordinate swapped twice in big endian.
2020-01-01 14:03:52 +01:00
1d8e854ba3
Merge branch 'master' into uv-coordinates-swapped-twice
2019-12-30 08:37:43 -05:00
6de5ff8f7d
Fixed UV coordinate swapped twice in big endian.
2019-12-30 08:30:34 -05:00
5ce373c312
Don't combine Collada animations when channels are shared
2019-12-29 16:05:33 -03:00
45601a49f7
Merge pull request #3 from assimp/master
...
Update to the latest version from upstream
2019-12-28 16:45:08 +01:00
58647c8c2e
Merge pull request #2853 from yunqiangshanbill/gltf-import-bug-fix
...
Gltf import bug fix
2019-12-28 09:08:34 +01:00
c9d9f2077d
Merge branch 'master' into gltf-import-bug-fix
2019-12-27 16:35:09 +01:00
04f7c5b67a
Merge pull request #2838 from malortie/hl1-mdl-loader
...
Added support to load Half-Life 1 MDL files.
2019-12-27 10:32:05 +01:00
d2ed36756c
fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed.
2019-12-27 11:21:05 +08:00
ab4166a279
Merge pull request #1 from assimp/master
...
sync all modify
2019-12-26 18:59:39 +08:00
2026d52df4
Improved comments in HL1MDLFile.h
2019-12-25 12:57:48 -05:00
7e957768db
Removed dead code.
2019-12-25 08:13:20 -05:00
1e29329a84
Merge branch 'master' into hl1-mdl-loader
2019-12-25 10:13:42 +01:00
70f793f52e
Merge pull request #2843 from 9739654/patch-1
...
Update SMDLoader.cpp
2019-12-24 08:13:55 +01:00
97bc855e80
Merge branch 'master' into patch-1
2019-12-23 23:27:21 +01:00
b9ac4c3fda
Merge pull request #2825 from bztsrc/master
...
MSVC workarounds
2019-12-23 23:26:52 +01:00
ae92a34d91
Update SMDLoader.cpp
...
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
2019-12-22 09:57:02 +01:00
79aeb65ab4
Merge branch 'master' into master
2019-12-22 09:18:02 +01:00
66750588cf
Merge pull request #2839 from apanteleev/vcruntime-fix
...
Made the CMake config more submodule friendly
2019-12-22 09:17:29 +01:00
4050f7601f
Merge branch 'master' into hl1-mdl-loader
2019-12-19 09:47:19 -05:00
Kim Kulling
Turo Lamminen
Turo Lamminen
Loïc
Dunni
RichardTea
Marc-Antoine Lortie
Marc-Antoine Lortie
Felipeek
Tomas Mariancik
bill.shan
yunqiangshanbill
Mateusz Paluch