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

7288 Commits (01070b4de7ef2788e75e7cab163e3a134148a240)

Author SHA1 Message Date
Kim Kulling df8a9450c8 Merge branch 'master' into coverity_scan 2018-12-26 20:43:04 +01:00
Kim Kulling 9c78a43fbe
Merge pull request #2285 from assimp/kimkulling-master 
Update .travis.yml
 2018-12-26 19:07:26 +01:00
Kim Kulling bc97e45d39
Update .travis.yml 
revert name of branch
 2018-12-26 18:22:29 +01:00
Kim Kulling 95e7086b9b
Merge pull request #2284 from assimp/kimkulling-dev 
Kimkulling dev
 2018-12-26 15:41:40 +01:00
Kim Kulling ef6b58c413
Merge branch 'master' into kimkulling-dev 2018-12-26 13:42:25 +01:00
Kim Kulling 49cce86f5f Testing: improve test coverage: 2018-12-26 13:40:22 +01:00
Kim Kulling 82cd16ab83 Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev 2018-12-26 09:50:19 +01:00
Kim Kulling 9e35f4c5b2
Merge pull request #2281 from assimp/kimkulling-dev 
Kimkulling dev
 2018-12-26 09:49:58 +01:00
Kim Kulling b3c2fdc11d python: fix review findings. 2018-12-23 14:28:40 +01:00
Kim Kulling 6631f7877a
Update Jassimp.java 
Fix another misinterpretation from the JNI-interface.
 2018-12-23 13:37:03 +01:00
Kim Kulling 7eee959d55 Review: fix wrong interpretation of methods for JNI. 2018-12-23 13:12:57 +01:00
Kim Kulling e9d1330edd Fix next finding. 2018-12-23 12:01:08 +01:00
Kim Kulling f73dd52956 Fix next finding. 2018-12-23 11:58:48 +01:00
Kim Kulling 3087ebb93a JAssimp: fix simple code analysis issues. 2018-12-23 11:57:32 +01:00
Kim Kulling 106bf19992
Merge pull request #2280 from assimp/kimkulling-dev 
Update .travis.yml
 2018-12-23 08:55:31 +01:00
Kim Kulling e5f6a72ecc
Update .travis.yml 
make coverity scan looking for master.
 2018-12-22 21:04:52 +01:00
Kim Kulling 4407071aa0
Merge pull request #2279 from assimp/kimkulling-dev 
Update Readme.md
 2018-12-22 19:02:48 +01:00
Kim Kulling 1a32558d47
Update Readme.md 
Add codacy badge.
 2018-12-22 15:17:10 +01:00
Kim Kulling d3a4aaaedb
Merge pull request #2278 from assimp/kimkulling-dev 
Update Readme.md
 2018-12-22 15:13:08 +01:00
Marco Di Benedetto cec163c025 Merge https://github.com/assimp/assimp 2018-12-22 13:50:54 +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
Marco Di Benedetto ad7964be63 imported animation fix. 2018-12-21 10:36:03 +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
Marco Di Benedetto cf6dff0b93 Merge https://github.com/assimp/assimp 2018-12-19 17:27:17 +01: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