v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,062 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

11062 Commits (2b3c49cb93d404a023fe8b852ebdb3e331fa6a15)

Author SHA1 Message Date
Kim Kulling 4141260fc9
Merge branch 'master' into master 2022-02-02 21:21:01 +01:00
Kim Kulling 6c4addf158
Merge pull request #4367 from umlaeute/bugfix/bigendian 
use fully qualified namespace in byteswap macros
 2022-01-31 23:48:41 +01:00
IOhannes m zmölnig (Debian/GNU) ed6b6cd65c use fully qualified namespace in byteswap macros 
Closes: https://github.com/assimp/assimp/issues/4358
 2022-01-31 14:42:59 +01:00
Tomas Maly 3976f9a092 fix compilation with clangcl on windows 2022-01-30 22:04:41 +01:00
Kim Kulling a214b0833f
Merge pull request #4359 from assimp/kimkulling-hmp_fix_override_issue4235 
HMP: Fix override during copying position data
 2022-01-27 00:09:20 +01:00
Kim Kulling f217bd4b5f
Update HMPLoader.cpp 2022-01-26 19:42:09 +01:00
Kim Kulling 305d1f45aa
Add some constants and fix compile 2022-01-26 19:36:38 +01:00
Kim Kulling 50b00d33b5
HMP: Fix override during copying position data 
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
 2022-01-26 19:22:52 +01:00
Kim Kulling 5698d41bf9
Merge pull request #4355 from assimp/kimkulling_fix_win64_warning_unreachable_code 
ASE: Fix warning unreachable code
 2022-01-24 20:43:34 +01:00
Kim Kulling 06fffb4f83 ASE: Fix warning unreachable code 2022-01-24 20:05:25 +01:00
Kim Kulling 83d4ab8563
Merge pull request #4353 from assimp/kimkulling-preparation_v5.2.0 
Udate version to 5.2.0
 2022-01-23 23:30:08 +01:00
Kim Kulling 91737f1cc9
Fix copyright: last year 2022-01-23 21:18:31 +01:00
Kim Kulling c4a66ae988
Update utVersion.cpp 2022-01-23 21:10:19 +01:00
Kim Kulling 1d34cb2c72
Udate version to 5.2.0 2022-01-23 21:09:20 +01:00
Kim Kulling c5634be708
Merge pull request #4338 from leonvictor/respect-cmake-output-variables 
CMAKE: Respect top-level CMAKE_*_OUTPUT_DIRECTORY variables
 2022-01-23 19:03:36 +01:00
Kim Kulling 6cc469a5ae
Merge branch 'master' into respect-cmake-output-variables 2022-01-23 18:11:47 +01:00
Kim Kulling 8b1d94d6b1
Merge branch 'master' into deprecated_gltfpbr_macros 2022-01-23 12:16:49 +01:00
Kim Kulling d45af75a5e
Merge pull request #4344 from revu-design/bensewell-fixifcopening4343 
IFC Reading: Fix opening reading.
 2022-01-23 12:15:38 +01:00
Ben Sewell 3e6fc3a64b Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343 2022-01-20 09:43:45 +00:00
Kim Kulling c142676908
Merge pull request #4346 from assimp/kimkulling-fuzzer_ase_outofbounds_issue_4232 
ASE: Fix material parsing
 2022-01-20 10:40:00 +01:00
Kim Kulling c1968823ad
ASE: Fix material parsing 
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
 2022-01-20 10:25:52 +01:00
Kim Kulling 985a5b9667
Merge pull request #4342 from assimp/krishty-new-file-detection 
Krishty new file detection
 2022-01-19 23:05:27 +01:00
Kim Kulling cbc4459dda Fix compile error: missing var 2022-01-19 22:03:11 +01:00
Kim Kulling 43763f53d6 Fix compile error: missing var 2022-01-19 22:00:53 +01:00
Kim Kulling 15b08f643a Fix warning: unused variable 2022-01-19 21:55:24 +01:00
Kim Kulling 17d5633a5b Add missing SImpleExtensionCheck 2022-01-19 21:42:14 +01:00
Kim Kulling 4cb76e6a18
Update UnrealLoader.cpp 2022-01-18 22:29:55 +01:00
Kim Kulling 12b01dd575
Update SMDLoader.cpp 2022-01-18 22:28:54 +01:00
Kim Kulling 7b24437f06
Update SIBImporter.cpp 2022-01-18 22:27:19 +01:00
Kim Kulling ec63fe74ee
Update RawLoader.cpp 2022-01-18 22:26:16 +01:00
Kim Kulling 088658b359
Update Q3BSPFileImporter.cpp 2022-01-18 22:25:43 +01:00
Kim Kulling b4dee9220d
Update Q3BSPFileImporter.cpp 2022-01-18 22:25:22 +01:00
Kim Kulling ffc13f18ba
NFF: reenable canRead 2022-01-18 22:24:11 +01:00
Kim Kulling 331cb5ac72
Update M3DImporter.cpp 2022-01-18 22:23:01 +01:00
Kim Kulling c3b91dd766
C4D. Fix merge conflicts 2022-01-18 22:21:58 +01:00
Kim Kulling ea5996307a
Update B3DImporter.cpp 2022-01-18 22:20:37 +01:00
Kim Kulling efd1d36aa9
Merge branch 'master' into krishty-new-file-detection 2022-01-18 22:17:50 +01:00
Kim Kulling 959af1ac4d
Revert change 2022-01-18 21:37:49 +01:00
Kim Kulling 7350baea93
Revert change 2022-01-18 21:36:55 +01:00
Kim Kulling cf47411742
Revert change 2022-01-18 21:36:02 +01:00
Kim Kulling 1e80630d5d
Revert change. 2022-01-18 21:35:09 +01:00
Kim Kulling 037732c429
Revert change 2022-01-18 21:34:18 +01:00
Kim Kulling cff213d4dd
Revert change 2022-01-18 21:33:05 +01:00
Kim Kulling 9d0006fecb
Revert change 2022-01-18 21:32:06 +01:00
Kim Kulling 5af79cac1d Fix unittests + small refactorings 2022-01-18 21:23:43 +01:00
Kim Kulling 141c6ca270
Merge pull request #4339 from Esri/jere9309/read_collada_materials 
Collada: Read all instance_material child nodes
 2022-01-18 20:28:39 +01:00
Jeremy Sigrist 59f28e168e
Merge branch 'master' into jere9309/read_collada_materials 2022-01-18 09:55:33 -08:00
Kim Kulling 3cca102531
Merge pull request #4265 from Garux/IQM 
add Inter-Quake Model (IQM) Importer
 2022-01-17 21:43:33 +01:00
Kim Kulling 6e50b04ae0
Merge branch 'master' into IQM 2022-01-17 18:33:37 +01:00
Kim Kulling f21ff66505
Merge pull request #4323 from tanolino/patch-1 
Locale independent meter scale
 2022-01-17 18:32:24 +01:00