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

6761 Commits (f170c842263b0d3ddd3d92e4445175ec9a6ae6dd)

Author SHA1 Message Date
Kim Kulling d3a4aaaedb
Merge pull request #2278 from assimp/kimkulling-dev 
Update Readme.md
 2018-12-22 15:13:08 +01:00
Kim Kulling 956f1d5347
Merge branch 'master' into kimkulling-dev 2018-12-22 12:24:18 +01:00
Kim Kulling 89c5a31cd8
Merge pull request #2274 from andresiraola/gltf2-fix-anim-import 
Fix animations import in gltf2
 2018-12-22 12:22:53 +01:00
Kim Kulling a655353430
Update Readme.md 
Add issue solution time-tracking.
 2018-12-22 11:20:31 +01:00
Kim Kulling 8b903716c2
Merge branch 'master' into gltf2-fix-anim-import 2018-12-22 11:03:52 +01:00
Kim Kulling 43690c13a8
Merge pull request #2270 from aavenel/SilentFlag 
Add silent flag to assimp cmd
 2018-12-22 10:58:35 +01:00
Kim Kulling 1d5d36d02c
Merge branch 'master' into SilentFlag 2018-12-22 09:21:42 +01:00
Kim Kulling 194b59b3b2
Update Info.cpp 
Add a simple check to avoid verbose + silent mode together,
 2018-12-22 09:12:10 +01:00
Kim Kulling c6a8c84753
Merge pull request #2277 from byzyn4ik/ios-support-update 
iOS support update
 2018-12-21 17:45:42 +01:00
Maxim Petrovsky b4c427912f added bitcode ios 2018-12-20 16:51:01 +02:00
Maxim Petrovsky 7ce8c9778b added arm64e to iOS build script 
added arm64e iOS cmake file
 2018-12-20 16:50:38 +02:00
Andrés Iraolagoitía 3c1d6a3f87 Fix animations import in gltf2 2018-12-19 20:28:43 -03:00
Kim Kulling 43dfd3e21f
Merge pull request #2269 from aavenel/MoreUnitTests 
More unit tests
 2018-12-17 17:44:53 +01:00
Alexandre Avenel b71b7982b5 Add silent flag to assimp cmd 
Add a new command line flag to assimp cmd in order to only display minimal
info when loading a file.

This is especially useful for quick profiling/fuzzing.
 2018-12-15 18:07:34 +01:00
Alexandre Avenel b226982a3c Add formatDetection unit-test for 3DS importer 2018-12-15 18:06:14 +01:00
Alexandre Avenel b25975af48 Add unit-test for STL format auto detection 2018-12-15 18:06:13 +01:00
Alexandre Avenel 95d9c16a3b Add minimal unit-test for LWO file format 2018-12-15 18:06:12 +01:00
Kim Kulling 15fe157fdc
Merge pull request #2261 from timmmeh/timmmeh-gltf2-validation-patch 
Fix failed Assimp validation for glTF2.0 official sample animations
 2018-12-11 20:15:42 +01:00
Kim Kulling ae7a045396
Merge branch 'master' into timmmeh-gltf2-validation-patch 2018-12-11 07:59:11 +01:00
Kim Kulling 0cbd798fe3
Merge pull request #2265 from assimp/issue_817 
closes https://github.com/assimp/assimp/issues/817: use emmisive fact…
 2018-12-11 00:28:44 +01:00
Kim Kulling b5ebd24688 closes https://github.com/assimp/assimp/issues/817: use emmisive factor instead of color. 2018-12-10 22:07:26 +01:00
Kim Kulling 553252bebf
Merge pull request #2259 from sfalexrog/allow_step_disable 
Use ADD_ASSIMP_IMPORTER for STEP importer
 2018-12-10 21:36:01 +01:00
Kim Kulling e22e93e6d7
Merge branch 'master' into allow_step_disable 2018-12-08 21:38:18 +01:00
Kim Kulling 71e6d733d0
Merge pull request #2253 from assimp/issue_2247 
closes https://github.com/assimp/assimp/issues/2247: change include f…
 2018-12-07 20:03:34 +01:00
Kim Kulling bf924e091d
Merge branch 'master' into issue_2247 2018-12-07 17:57:31 +01:00
Kim Kulling 2f09d7f670
Merge pull request #2263 from migenius/migenius-fix-nulltexcheck 
Add check for NULL texcoord values in glTF2.
 2018-12-07 17:57:03 +01:00
ardenpm fd75e4923c
Merge pull request #7 from migenius/migenius-rsws52 
Add check for NULL texcoord values.
 2018-12-07 09:38:41 +11:00
ardenpm 181d801c5a
Merge pull request #6 from assimp/master 
Merge changes from assimp master
 2018-12-07 09:34:55 +11:00
Kim Kulling 9d6e7b6076
Merge pull request #2257 from twhittock/collada-export 
collada export: Use Camera local coordinate system
 2018-12-06 21:47:22 +01:00
Paul Arden f63caf894e Add check for NULL texcoord values. 2018-12-06 12:56:02 +11:00
tirichards bb9e3c3593 Fix failed assimp validation for glTF2 sample animations 2018-12-05 14:46:56 -08:00
sfalexrog af323de741 Use ADD_ASSIMP_IMPORTER for STEP importer 2018-12-04 23:28:50 +03:00
twhittock 8b6c6613f9
collada export: Use Camera local coordinate system 
Fixes #2255
 2018-12-04 14:44:49 +00:00
Kim Kulling abbe3261b3
Merge branch 'master' into issue_2247 2018-12-04 13:08:51 +01:00
Kim Kulling d7eae5bb13
Merge pull request #2250 from assimp/OFF_Importer_Redesign_js_francal 
closes https://github.com/assimp/assimp/issues/2228: prepare pull-req…
 2018-12-04 13:08:34 +01:00
Kim Kulling 7b63efd690
Merge branch 'master' into issue_2247 2018-12-04 11:38:57 +01:00
Kim Kulling f49dbc8f62
Merge branch 'master' into OFF_Importer_Redesign_js_francal 2018-12-03 23:15:05 +01:00
Kim Kulling 0abacb6c94
Merge pull request #2252 from sfalexrog/fix_cmake_typo 
Fix CMake target alias typo
 2018-12-03 23:14:41 +01:00
Kim Kulling b506d35999 closes https://github.com/assimp/assimp/issues/2247: change include folder from debian package from /usr/lib/include to /usr/include 2018-12-03 21:53:54 +01:00
Kim Kulling ce91f5c888 Off-Importer: introduce unittest. 2018-12-03 21:24:06 +01:00
sfalexrog 30d3c8c6a3 Fix CMake target alias typo 2018-12-03 23:22:34 +03:00
Kim Kulling bb66af544a closes https://github.com/assimp/assimp/issues/2228: prepare pull-request. 2018-12-02 13:08:47 +01:00
Kim Kulling 831cbcf699
Merge pull request #2218 from assimp/kimkulling-patch-2-1 
Update Exporter.cpp
 2018-12-01 19:40:19 +01:00
Kim Kulling 117a2bc116
Merge branch 'master' into kimkulling-patch-2-1 2018-12-01 18:41:15 +01:00
Kim Kulling da0d49f751
Merge pull request #2244 from bubba/gltf2-anim-duration 
Calculate the mMaxDuration property based off of keyframes for GLTF2
 2018-12-01 18:40:45 +01:00
Kim Kulling aa0a5bb36f
Merge branch 'master' into gltf2-anim-duration 2018-12-01 13:41:54 +01:00
Kim Kulling 7e06c401f0
Merge pull request #2219 from assimp/kimkulling-issue_2212 
Update vector2.h
 2018-12-01 13:41:37 +01:00
Kim Kulling dd21e4023e
Merge branch 'master' into kimkulling-issue_2212 2018-12-01 09:49:03 +01:00
Kim Kulling 9cc277607d
Merge pull request #2249 from wxyu247/dev 
Update SMDImporter
 2018-12-01 09:42:41 +01:00
Kim Kulling 576673536b
Update SMDLoader.cpp 
Fix compiler warning and do some reformattings.
 2018-11-30 22:17:42 +01:00