summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/extras
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-221-7/+7
|\
| * Replace use of qmlRegisterRevisionKai Koehne2018-09-201-7/+7
* | Automatically register the latest import versionKai Koehne2018-09-062-1/+4
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-081-2/+1
|/
* Enable alpha blending on QTextureMaterialMike Krus2018-03-081-0/+1
* Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-201-0/+2
|\
| * Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-151-0/+2
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-1/+1
|/
* QMetalRoughMaterial replaces QTexturedMetalRoughMaterialKevin Ottens2017-09-041-1/+1
* Use layers to have only one graph for Metal/RoughKevin Ottens2017-09-041-0/+1
* Introduce QSpriteSheetMike Krus2017-07-081-0/+5
* Introduce QSpriteGridMike Krus2017-07-081-0/+3
* Add a new mirrored property to QPlane(Mesh|Geometry)Kevin Ottens2017-05-051-0/+2
* Update qmltypes filesMike Krus2017-05-031-206/+188
* Merge branch '5.8' into 5.9Sean Harmer2017-04-021-12/+14
|\
| * Coding convention fix for Src/importscore, importsextras,5.8Robert Brock2017-04-011-7/+8
* | QDistanceFieldText cleanupPaul Lemire2017-02-231-2/+2
* | QDistanceFieldGlyphCache cleanupPaul Lemire2017-02-231-3/+0
* | Start using REVISION on our propertiesKevin Ottens2017-02-231-0/+2
* | Fix QML version registration for 5.9 typesKevin Ottens2017-02-231-8/+8
* | Metal/Rough materials: metallic -> metalnessKevin Ottens2017-02-161-10/+10
* | Extruded Text cleanupPaul Lemire2017-02-161-4/+4
* | Register QMorphPhongMaterial for qmlAntti Määttä2017-02-131-0/+2
* | Move animations from extras to animationsAntti Määttä2017-02-071-19/+0
* | Quick3DExtras: fix QAbstractAnimation import versionPaul Lemire2017-02-061-1/+1
* | Fix iOS static buildMike Krus2017-02-051-1/+0
* | Merge branch 'wip/animation' into devSean Harmer2017-01-313-1/+42
|\ \
| * | Animation support for Qt3DAntti Määttä2017-01-313-1/+42
* | | Updating Qt3D.Extras qmltypesKevin Ottens2017-01-311-0/+162
* | | Uniform color PBR lighting to Qt3DExtrasKevin Ottens2017-01-311-0/+2
* | | QDistanceFieldText: export to QMLPaul Lemire2017-01-301-2/+6
* | | Adding PBR lighting to Qt3DExtrasKevin Ottens2017-01-271-0/+2
* | | Update Qt3D.Extras qmltypes fileKevin Ottens2017-01-271-300/+737
* | | Remove resources generation in importextrasKevin Ottens2017-01-273-51/+2
* | | Port LevelOfDetailLoader to a C++ implementationKevin Ottens2017-01-274-85/+6
* | | Remove FirstPersonCameraController.qmlKevin Ottens2017-01-273-194/+2
* | | Remove OrbitCameraController.qmlKevin Ottens2017-01-273-238/+4
* | | Replace SkyboxEntity.qml with QSkyboxEntityKevin Ottens2017-01-273-154/+4
* | | Remove ForwardRenderer.qml, QForwardRenderer is enoughKevin Ottens2017-01-273-80/+4
* | | Remove the QML based default EffectsKevin Ottens2017-01-275-374/+0
* | | Introduce QTextureMaterialKevin Ottens2017-01-273-71/+2
* | | Consolidate QML/C++ materials in extrasKevin Ottens2017-01-2711-742/+20
|/ /
* | LevelOfDetail (LOD) nodeMike Krus2017-01-233-1/+84
* | Quick3DExtras: register Text3DGeometry, Text3DMeshPaul Lemire2017-01-131-0/+5
|/
* Merge branch '5.7' into 5.8Sean Harmer2016-10-101-9/+81
|\
| * Update QML type information for Qt CreatorKevin Ottens2016-09-261-9/+81
* | Skybox examples: do not mirror imagesPaul Lemire2016-10-101-6/+6
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-201-9/+9
|\|
| * Fix camera controllersMiikka Heikkinen2016-09-051-9/+9
* | OrbitCameraController: disable logical device when disabledPaul Lemire2016-08-271-0/+1