summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* | Add support to load data from memory for scene loadersMike Krus2017-05-214-28/+82
* | Merge branch '5.9' into devSean Harmer2017-05-215-40/+74
|\|
| * Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-082-12/+36
| |\
| | * AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-052-12/+36
| * | Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-041-2/+8
| |\|
| | * Modify configure to build with no assimpMäättä Antti2017-04-271-2/+3
| | * Fix build for -no-feature-regularexpressionStephan Binner2017-04-271-1/+1
| | * Fix build for -no-feature-temporaryfileStephan Binner2017-04-271-1/+6
| * | Use non-template version of QVariant::value (clazy reports)Mike Krus2017-05-021-1/+1
| * | Remove unneeded temporary container (clazy reports)Mike Krus2017-05-022-6/+10
| * | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-022-7/+7
| * | Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-022-19/+19
| |/
| * AssimpRawTextureImage: fix creation of QTextureImageDataPtrPaul Lemire2017-04-271-2/+3
* | Merge branch '5.9' into devSean Harmer2017-04-038-29/+1628
|\|
| * Merge "Merge branch '5.8' into 5.9" into refs/staging/5.9Sean Harmer2017-04-026-25/+1619
| |\
| | * Merge branch '5.8' into 5.9Sean Harmer2017-04-026-25/+1619
| | |\
| | | * Fixes includes to comply with coding conventions for Src/sceneRobert Brock2017-04-016-45/+43
| | | * Use QTextureLoader for textures in GLTF filesMauro Persano2017-01-101-10/+3
| * | | Disable two functions not currently in useThiago Macieira2017-04-021-0/+2
| |/ /
| * | Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-313-3/+3
| * | Update assimp lib to 3.3.1Andy Maloney2017-03-141-1/+4
* | | Don't allocate temporary containers while iteratingSergio Martins2017-04-022-2/+2
|/ /
* | Move animations from extras to animationsAntti Määttä2017-02-073-24/+24
* | Animation support for Qt3DAntti Määttä2017-01-312-7/+350
* | GLTF Export QCamera properlyMiikka Heikkinen2017-01-184-9/+35
* | QGLTF exporting basic mesh typesMiikka Heikkinen2016-12-133-307/+483
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-122-2/+1560
|\|
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-0/+1560
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-0/+1560
| | |\
| | | * GLTFIO: check return value of QFile::open()Marc Mutz2016-10-051-6/+4
| * | | Doc: various link errors qt3dNico Vertriest2016-10-131-2/+0
* | | | Use the static QFileInfo::exists(), it's fasterSergio Martins2016-12-101-1/+1
* | | | GLTF exporting materials with custom shadersMiikka Heikkinen2016-12-094-772/+1501
* | | | Fix GLTFImporter crash on loading second sceneMiikka Heikkinen2016-11-161-2/+2
* | | | GLTF Scene export pluginMiikka Heikkinen2016-11-168-127/+2229
* | | | Renaming Scene IO classes to scene import classesOtto Ryynänen2016-10-108-171/+171
|/ / /
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-051-0/+1
|\| |
| * | Add fbx to supported file formats listAntti Määttä2016-08-311-0/+1
* | | Fix API consistency in QAttributeKevin Ottens2016-07-211-4/+4
|/ /
* | Fix applications using SceneLoader crashing at exitJanne Koskinen2016-06-081-29/+29
* | GLTFIO: fix mem leak and invalid QEntity tree constructionMarc Mutz2016-06-081-0/+1
* | Fix crash when a referenced shader program isn't found in a gltf file.Volker Krause2016-05-281-3/+3
* | Replace Q_DECL_NOEXCEPT by Q_DECL_NOTHROWPaul Lemire2016-05-231-2/+2