adf83a6193
Update ccpp.yml
2021-01-27 19:55:17 +01:00
6e375ca1a7
Update CMakeLists.txt
2021-01-27 19:53:11 +01:00
f7c76fae52
Merge branch 'master' into static_zlib
2021-01-26 18:52:45 +01:00
2cd6cd603c
Merge pull request #3615 from assimp/kimkulling-funding_update
...
Replace patreon by opencollective
2021-01-26 18:51:29 +01:00
c12f747bde
Merge branch 'master' into kimkulling-funding_update
2021-01-26 18:25:07 +01:00
b6b061b21a
Merge pull request #3610 from assimp/kimkulling-remove_appveyor
...
Delete appveyor.yml
2021-01-26 18:24:47 +01:00
95fe3e98a6
Merge branch 'master' into kimkulling-remove_appveyor
2021-01-26 18:09:43 +01:00
0244aec0a5
Update Readme.md
2021-01-26 18:09:25 +01:00
d04b1b9e2e
Replace patreon by opencollective
2021-01-26 18:08:20 +01:00
b6f577d7c4
Fix typo in ci script
2021-01-26 09:25:28 +01:00
4fa8840678
Merge branch 'master' into static_zlib
2021-01-26 09:22:14 +01:00
534037f76b
enable own zlib build in ci for windows
2021-01-26 09:14:06 +01:00
294d4230b0
Merge pull request #3612 from assimp/kimkulling-issue_3601
...
Add missing skip
2021-01-24 18:59:03 +01:00
243d017463
Add missing skip
...
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
47dd6c0786
Merge pull request #3611 from assimp/kimkulling-issue_3599
...
Fix typo in collada parser
2021-01-24 18:37:16 +01:00
a2b889ab09
Fix typo in collada parser
...
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
e18261953d
Delete mtime_cache
2021-01-24 18:14:43 +01:00
7a706be920
Delete cacheglobs.txt
2021-01-24 18:14:36 +01:00
dd0facd722
Delete appveyor.yml
2021-01-24 18:14:00 +01:00
9dc95be939
Merge pull request #3596 from RichardTea/vs_gitignore_update
...
Update gitignore for default VS2019 behaviour
2021-01-24 10:07:08 +01:00
5390e035d5
Merge branch 'master' into vs_gitignore_update
2021-01-24 09:47:12 +01:00
28c9bccbef
Merge pull request #3603 from assimp/kimkulling-remove_redundancy
...
Remove redundant statement in if
2021-01-22 14:36:59 +01:00
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
e321367dae
Merge pull request #3602 from assimp/kimkulling-issue3151
...
Update 3DSLoader.cpp
2021-01-22 14:18:20 +01:00
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
6293c22c5c
Merge branch 'master' into vs_gitignore_update
2021-01-22 12:59:42 +01:00
c9c54822fd
Merge pull request #3594 from xiaohunqupo/master
...
Fix STL Expoter error.
2021-01-22 12:59:18 +01:00
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
71e8c1001e
Merge pull request #3582 from makitsune/fix-gltf-vertex-colors
...
Fix glTF vertex colors with types other than float
2021-01-22 09:51:37 +01:00
e435a43e53
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-22 08:04:04 +01:00
b64f1c40f4
Merge pull request #3600 from assimp/kimkulling-doc
...
Update Build.md
2021-01-22 07:59:18 +01:00
345726f5c8
Update Build.md
2021-01-21 20:56:21 +01:00
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
5e21b9f72d
Merge pull request #3580 from mmp/tdb/pbrt3_exporter
...
pbrt-v4 exporter
2021-01-21 11:48:19 +01:00
0b9cbb53ab
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-21 11:27:35 +01:00
fabea8ccd0
Merge pull request #3587 from assimp/build_fixes
...
Win32-refactorings
2021-01-21 11:26:45 +01:00
7dcac538f8
Merge branch 'master' into build_fixes
2021-01-21 09:03:06 +01:00
4e0c4d7bb7
Update PbrtExporter.h
2021-01-20 21:11:14 +01:00
11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-20 20:03:30 +01:00
011ec086ca
ensure shared dlls are exporting zlib symbols
2021-01-20 12:47:14 +01:00
c1be6c76c8
Update gitignore for Visual Studio 2019
...
Default behaviour of VS2019 "Open Folder" for cmake projects:
- Build into "out/" folder in-source
- Store the config in CMakeSettings.json
- Keep VS info in .vs/ folder
2021-01-20 10:20:47 +00:00
77d710bc64
add missing include
2021-01-20 11:01:20 +01:00
4b14b702ae
Fix try
2021-01-20 10:42:46 +01:00
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
109ded407d
Merge branch 'master' of https://github.com/assimp/assimp
2021-01-20 08:46:19 +01:00
c52e5c4da8
Merge pull request #3592 from assimp/kimkulling-oss_fuzz29168
...
Fix nullptr access
2021-01-20 08:32:42 +01:00
f8dd3a9aa6
Update DefaultIOSystem.cpp
2021-01-20 08:05:43 +01:00
ed3e745752
Update DefaultIOSystem.cpp
2021-01-19 21:58:04 +01:00
Kim Kulling
kimkulling
RichardTea
xiaohunqupo
kkulling