0273ffc367
Merge branch 'master' into master
2020-01-30 09:46:41 +01:00
02ce1d0776
Merge pull request #2880 from assimp/kimkulling-patch-1
...
Update EmbedTexturesProcess.cpp
2020-01-30 09:46:07 +01:00
cb623f8b74
Merge branch 'master' into master
2020-01-29 22:24:48 +01:00
398a8f757e
Additional checks on invalid input
2020-01-29 22:08:34 +01:00
6c95ee145c
Merge branch 'master' into kimkulling-patch-1
2020-01-29 14:37:32 +01:00
26179cd4d2
Merge pull request #2941 from LoicFr/master
...
Fix version revision formatting in glTF metadata
2020-01-29 13:19:01 +01:00
e40df80d0e
Merge branch 'master' into master
2020-01-29 10:57:06 +01:00
0c9c0ab360
Merge pull request #2968 from assimp/issue_1592
...
closes https://github.com/assimp/assimp/issues/1592 :
2020-01-29 10:56:35 +01:00
3ce35074c7
Merge branch 'master' into issue_1592
2020-01-29 08:13:31 +01:00
6c3afe2633
Merge pull request #2967 from malortie/refactor-assbin-export-and-dump-writer
...
Refactored Assbin exporter and assimp_cmd binary serialization functions.
2020-01-29 08:11:32 +01:00
5860d63efc
Update appveyor.yml
...
Disable compilers to improve appveyor build performance
2020-01-28 22:02:29 +01:00
81bc7825d1
Potentially fixed strncpy warning by Coverity.
2020-01-28 14:02:09 -05:00
dd1a11b585
closes https://github.com/assimp/assimp/issues/1592 : make install optional, default enabled.
2020-01-28 19:37:38 +01:00
5f30d4c0f8
Added missing cmd writting.
2020-01-28 12:30:09 -05:00
a328c18286
Fixed "printf format not a literal error" in build.
2020-01-28 11:06:17 -05:00
21edb13ff8
Added missing header for unique_ptr.
2020-01-28 10:55:22 -05:00
20388d6a4f
Refactored Assbin exporter and assimp_cmd binary serialization functions.
...
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
27449f17ca
Merge branch 'master' into master
2020-01-28 14:13:29 +01:00
7cad59bf0e
Merge pull request #2943 from malortie/hl1-mdl-fix-texture-format
...
[MDL HL1] Fixed wrong texture format used.
2020-01-28 13:02:18 +01:00
2c430bc82a
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-28 11:13:17 +01:00
6cb2236cf7
Merge pull request #2958 from malortie/assimp-cmd-improved-error-codes
...
Uniformized error codes (return values) in assimp_cmd.
2020-01-28 09:22:32 +01:00
16d71908d7
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-27 18:01:03 -05:00
26a5c5a8ad
Merge branch 'master' into assimp-cmd-improved-error-codes
2020-01-27 18:00:16 -05:00
e41a59ee1f
Merge pull request #2960 from tellypresence/revert-corrupt-image-files
...
Revert image files corrupted by a8a1ca9
2020-01-27 23:55:31 +01:00
d59ffcb674
Merge branch 'master' into assimp-cmd-improved-error-codes
2020-01-27 20:44:48 +01:00
46faa1e523
Merge branch 'master' into revert-corrupt-image-files
2020-01-27 20:24:17 +01:00
1e3f7137fa
Merge pull request #2962 from RichardTea/macos_rpath
...
Remove explicit setting of macos install_name
2020-01-27 20:21:18 +01:00
4337c07e4b
Remove explicit setting of macos install_name
...
Use CMake default behaviour for libassimp
Fixes #2961
2020-01-27 17:08:56 +00:00
9e1eba7912
Revert image files corrupted by a8a1ca9
2020-01-27 19:58:05 +09:00
ab284f7996
Fixed enumeral mismatch error in build.
2020-01-26 14:02:16 -05:00
b23c0b0637
Uniformized error codes (return values) in assimp_cmd.
2020-01-26 13:10:21 -05:00
5ab67f6491
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-25 13:34:59 -05:00
a1fbe74e87
Merge pull request #2952 from malortie/hl1-mdl-load-external-textures
...
Added support to load HL1 MDL external texture files directly.
2020-01-25 19:23:05 +01:00
fc4ae3586e
Update utMDLImporter.cpp
...
unittests: Fix compiler warning: comparison between signed and unsigned.
2020-01-25 11:31:14 +01:00
48bb2978af
Added support to load HL1 MDL external texture files directly.
2020-01-24 13:14:37 -05:00
b9ae88f200
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-24 07:20:03 -05:00
57c735cdca
Merge branch 'master' into master
2020-01-24 11:30:59 +01:00
dbee3807b3
Merge pull request #2948 from malortie/update-texture-format-size
...
Updated places where read/write for achFormatHint (Redone).
2020-01-24 11:27:00 +01:00
770c822621
Updated places to achFormatHint referencing array size.
2020-01-23 15:26:49 -05:00
316a8dff4e
Merge pull request #2928 from malortie/hl1-mdl-deletion-temp-nodes
...
[MDL HL1] Fixed children nodes not deleted.
2020-01-23 20:38:53 +01:00
e569831253
Update HL1MDLLoader.cpp
...
Fix possible x64 issue.
2020-01-23 16:20:34 +01:00
b74b96fca4
Merge branch 'master' into hl1-mdl-deletion-temp-nodes
2020-01-23 15:17:19 +01:00
5b09758f15
Update HL1MDLLoader.cpp
...
Fix compiler warning
2020-01-23 15:04:07 +01:00
259d670f54
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-23 11:14:05 +01:00
eb5c581b82
Merge pull request #2933 from malortie/update-copyright-end-date
...
Updated copyright dates.
2020-01-23 11:02:18 +01:00
092883cf19
Merge branch 'master' into update-copyright-end-date
2020-01-22 18:03:43 +01:00
11d98e7cf6
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-22 10:47:34 -05:00
eb5b3bc347
Merge pull request #2940 from turol/memleak-fix
...
Fix memory leak in .X importer
2020-01-22 17:18:57 +02:00
3e8a33aae3
Fixed wrong texture format used in HL1 MDL loader.
2020-01-22 10:02:38 -05:00
2ebafe0693
Fix version revision formatting in glTF metadata
2020-01-22 12:40:57 +01:00
Kim Kulling
Zoltan Baldaszti
bzt
Marc-Antoine Lortie
Kim Kulling
Marc-Antoine Lortie
RichardTea
tellypresence
Turo Lamminen
Loïc