summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\| |
| * | 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
* | Move QTextureImageDataGenerator to its own headerPaul Lemire2016-05-201-0/+1
* | Enable QT_NO_FOREACH for all Qt3D libraries and pluginsMarc Mutz2016-05-142-0/+6
* | plugins: eradicate all Q_FOREACH loopsMarc Mutz2016-05-141-2/+6
* | GLTFIO: claim copyright for the substantial recent changesMarc Mutz2016-05-051-1/+1
* | GLTFIO: move QFile::readAll() into resolveLocalData()Marc Mutz2016-05-052-10/+7
* | GLTFIO: replace QMap with QHashMarc Mutz2016-05-051-11/+11
* | GLTFIO: includemocsMarc Mutz2016-05-051-0/+2
* | GLTFIO: use printf-style qWarning/qDebug where possibleMarc Mutz2016-05-051-58/+81
* | GLTFIO: wrap remaining qWarning()s in Q_UNLIKELYMarc Mutz2016-05-051-27/+27
* | GLTFIO: replace static const QLatin1Strings with #definesMarc Mutz2016-05-051-69/+69
* | GLTFIO: brush up ctors of nested structsMarc Mutz2016-05-052-19/+16