summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers
Commit message (Expand)AuthorAgeFilesLines
* Accept CBOR as optional format in gltf dataUlf Hermann2019-10-291-11/+3
* Merge remote-tracking branch 'origin/5.13' into 5.14Paul Lemire2019-10-151-1/+1
|\
| * Ensure we can build assimp on Windows and macOS with non gcc compilersAndy Shaw2019-10-071-1/+1
* | Fix deprecation warningsMike Krus2019-07-301-11/+0
* | assimp plugin: replace QMap with a C arrayMarc Mutz2019-07-222-35/+28
* | AssimpImporter: remove unused QMapMarc Mutz2019-07-221-2/+0
* | Remove unused file gltfparser.cppMarc Mutz2019-07-181-1560/+0
* | Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-223-9/+0
* | GLTFExporter: remove duplicate definitionMarc Mutz2017-12-281-1/+0
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-191-1/+1
|\|
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-161-1/+1
| |\
| | * Enable assimp for gcc 5.x buildsKarim Pinter2019-02-121-1/+1
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-091-0/+1
| |\|
| | * Fix Assimp scene loader plugin resource pathsLee Helpingstine2019-02-081-0/+1
* | | Add support for glDepthRangeJim Albamont2019-02-112-3/+12
|/ /
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+1
|\|
| * assimp: Provide names for generated child entitiesMichael Brasser2019-01-311-0/+1
* | Preliminary glTF 2.0 scene import supportMassimo Callegari2018-12-222-152/+635
|/
* Allow to build assimp sceneparser on Android when using clangPaul Lemire2018-08-131-1/+2
* Doc: Remove private classes from public documentationPaul Wicking2018-07-113-0/+3
* Fix compile warningsPaul Lemire2018-06-201-1/+2
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-191-1/+1
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+1
|\
| * gltf sceneloader: request mirrored=false for texturesLaszlo Agocs2018-04-271-0/+1
* | Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-203-7/+7
|/
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-152-10/+10
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-052-10/+10
| |\
| | * Cleanup AssimpImporterPaul Lemire2018-02-012-10/+10
* | | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+1
|\| |
| * | Fix warning about unused variableThiago Macieira2018-01-301-0/+1
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-221-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-221-0/+1
| |\|
| | * AssimpImporter: disable default mirroring on texturesPaul Lemire2018-01-221-0/+1
* | | Merge branch '5.10' into devSean Harmer2018-01-173-23/+36
|\| |
| * | Prevent potential containers detachingMike Krus2018-01-142-21/+34
| * | Iterate on references to avoid copiesMike Krus2018-01-132-2/+2
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-053-13/+68
|\| |
| * | Doc: add doc to class AssimpImporterNico Vertriest2017-09-291-3/+3
| * | Doc: add doc to classes GLTFImporter and GLTFExporterNico Vertriest2017-09-292-4/+54
| * | PhongAlpha: encode the alpha in kdKevin Ottens2017-09-271-6/+11
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-251-45/+45
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-253-9/+9
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-255-18/+18
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-09-012-84/+43
|\|
| * Fix crash when loading multiple assimp scenesMauro Persano2017-08-242-84/+43
* | Merge branch '5.9' into devSean Harmer2017-08-191-0/+34
|\|
| * Fix memory leaks in assimp SceneLoaderMäättä Antti2017-07-201-0/+34
* | Merge branch '5.9' into devSean Harmer2017-06-191-1/+1
|\|
| * Fix crash when loading fbx file with embedded texturesMounir BOUDRIFA2017-05-301-1/+1