summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Add support to load data from memory for scene loadersMike Krus2017-05-214-28/+82
* Merge branch '5.9' into devSean Harmer2017-05-217-43/+77
|\
| * Merge branch '5.9.0' into 5.9Sean Harmer2017-05-204-28/+32
| |\
| | * Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-082-12/+36
| | |\
| | * \ Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-042-3/+9
| | |\ \
| | * | | 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-023-8/+8
| | * | | Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-022-19/+19
| * | | | Fix build with QT_STRICT_ITERATORSSergio Martins2017-05-191-1/+1
| | |_|/ | |/| |
| * | | AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-052-12/+36
| | |/ | |/|
| * | Modify configure to build with no assimpMäättä Antti2017-04-271-2/+3
| * | Fix build for -no-feature-regularexpressionStephan Binner2017-04-272-2/+2
| * | Fix build for -no-feature-temporaryfileStephan Binner2017-04-271-1/+6
| |/
| * AssimpRawTextureImage: fix creation of QTextureImageDataPtrPaul Lemire2017-04-271-2/+3
* | Merge branch '5.9' into devSean Harmer2017-04-0314-35/+1634
|\|
| * 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-319-9/+9
| * | 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 scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-282-4/+2
* | Move animations from extras to animationsAntti Määttä2017-02-073-24/+24
* | Improve documentation for QMeshMike Krus2017-02-061-2/+4
* | Fix build for INTEGRITYKimmo Ollila2017-02-061-10/+10
* | Merge branch 'wip/animation' into devSean Harmer2017-01-312-7/+350
|\ \
| * | Animation support for Qt3DAntti Määttä2017-01-312-7/+350
* | | Merge branch 'wip/qtquickintegration' into devSean Harmer2017-01-296-0/+292
|\ \ \ | |/ / |/| |
| * | Add scene2dpluginAntti Määttä2017-01-276-0/+292
* | | Added FBX geometry loaderGuillermo A. Amaral2017-01-208-0/+757
* | | GeometryLoader const and cleanupGuillermo A. Amaral2017-01-203-36/+34
* | | Added GLTF geometry loaderGuillermo A. Amaral2017-01-206-0/+701
* | | Ported PLY and STL geometry loadersGuillermo A. Amaral2017-01-207-2/+788
* | | QMesh geometry loading via plugin systemGuillermo A. Amaral2017-01-208-0/+930
|/ /
* | 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
|\| |