 RichardTea
|
49459435df
Merge branch 'master' into collada_metadata
|
6 жил өмнө |
|
RichardTea
|
4507f7cf46
Merge pull request #4 from assimp/master
|
6 жил өмнө |
 Kim Kulling
|
d72c8e9c22
Merge pull request #2414 from assimp/kimkulling-dev-2
|
6 жил өмнө |
|
Kim Kulling
|
dbd0f06d32
Update CMakeLists.txt
|
6 жил өмнө |
|
RichardTea
|
e3a397a98d
Merge pull request #3 from assimp/master
|
6 жил өмнө |
|
RichardTea
|
d66166675a
first pass at collada metadata
|
6 жил өмнө |
|
Kim Kulling
|
d3d98a7ec0
Merge pull request #2409 from assimp/issue_2336
|
6 жил өмнө |
|
Kim Kulling
|
98ed6a2e18
Merge branch 'master' into issue_2336
|
6 жил өмнө |
|
Kim Kulling
|
189bb2a233
Merge pull request #2407 from mlavik1/issue_1957
|
6 жил өмнө |
|
RichardTea
|
2a3626577f
Merge pull request #2 from assimp/master
|
6 жил өмнө |
|
Kim Kulling
|
6dec1346ed
Merge branch 'master' into issue_1957
|
6 жил өмнө |
|
Kim Kulling
|
0973f504b5
Merge pull request #2378 from assimp/issue_1650
|
6 жил өмнө |
 kimkulling
|
79f62b0174
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build.
|
6 жил өмнө |
|
Kim Kulling
|
f7d226768c
Merge branch 'master' into issue_1650
|
6 жил өмнө |
|
Kim Kulling
|
37357515fa
Update irrXML.h
|
6 жил өмнө |
 Matias Lavik
|
ddfc140fc3
Added <stdint.h>-include
|
6 жил өмнө |
|
Matias Lavik
|
fac392d6cb
Added missing include and fixed a mistake
|
6 жил өмнө |
|
Matias Lavik
|
015e960d0e
Merge branch 'master' into issue_1957
|
6 жил өмнө |
|
Matias Lavik
|
b3177a2a9a
issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer.
|
6 жил өмнө |
|
Kim Kulling
|
03bd8905f5
Merge pull request #2391 from mlavik1/issue_2390
|
6 жил өмнө |
|
Kim Kulling
|
c321fb6a44
Update FBXConverter.cpp
|
6 жил өмнө |
|
Matias Lavik
|
d0ad03d653
Merge branch 'master' into issue_2390
|
6 жил өмнө |
|
Kim Kulling
|
225b6fa166
Merge pull request #2404 from mlavik1/issue_2043
|
6 жил өмнө |
|
Matias Lavik
|
898e59d8ee
Merge branch 'master' into issue_2043
|
6 жил өмнө |
 Matias
|
20acce1c5e
Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use.
|
6 жил өмнө |
|
Matias Lavik
|
3abb494dd6
Merge branch 'master' into issue_2390
|
6 жил өмнө |
|
Kim Kulling
|
010afeb1d8
Merge branch 'master' into issue_1650
|
6 жил өмнө |
|
Kim Kulling
|
01d4b10f14
Merge pull request #2399 from assimp/issue_2398
|
6 жил өмнө |
|
Matias Lavik
|
e63b9d4cd8
Merge branch 'master' into issue_2390
|
6 жил өмнө |
|
Matias Lavik
|
6d1514dd10
replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now)
|
6 жил өмнө |
