summaryrefslogtreecommitdiffstats
path: root/src/quick3d
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-222-1/+6
|\
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-182-9/+20
| |\
| | * Scene3DRenderer: ensure window pointer stays the same while renderingv5.9.4Paul Lemire2018-01-102-9/+20
| * | Scene3D: allow to force blocking renderingPaul Lemire2018-01-162-1/+6
| |/
* | Merge branch '5.9' into 5.10Sean Harmer2018-01-124-9/+14
|\|
| * Set devicePixelRatio on item size changeMorten Johan Sørvig2017-12-143-7/+10
| * Quick3DNodeInstantiatorPrivate: Fix build after private API changeFriedemann Kleint2017-12-141-2/+4
* | Scene3DRenderer: ensure window pointer stays the same while renderingPaul Lemire2017-11-232-8/+19
* | Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-151-0/+2
* | Port away from QBuffer::typeKevin Ottens2017-09-221-1/+1
* | Merge branch '5.9' into 5.10Sean Harmer2017-09-121-1/+1
|\|
| * Qt3DQuickWindow: Instantiate QQmlAspectEngine after aspectsWieland Hagen2017-09-081-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
* | Export QSkeletonMapping to QMLSean Harmer2017-09-021-1/+4
* | Alter QChannelMapping to accept QAbstractChannelMapping pointersSean Harmer2017-08-312-18/+18
* | Re-enable the QQmlType code paths in the node factoriesSean Harmer2017-08-2512-27/+13
* | BlitFramebuffer framegraph nodeJuan José Casafranca2017-08-231-0/+2
* | Merge branch '5.9' into devSean Harmer2017-08-1911-7/+17
|\|
| * Fix Quick3DNode factories following QQmlType changesPaul Lemire2017-08-1610-27/+15
| * Disable QQmlType codepathsPaul Lemire2017-08-035-0/+10
* | Add QProximityFilter FrameGraphNodePaul Lemire2017-08-181-0/+2
* | Add extension object for QJoint to manage child joints from QMLSean Harmer2017-08-164-2/+191
* | Export QSkeletonLoader and base class to QMLSean Harmer2017-08-081-0/+4
* | Export QArmature to QMLSean Harmer2017-08-081-0/+2
* | Allow to disable aspects at configure timePaul Lemire2017-08-022-2/+23
* | Add QClock to Qt3DAnimationChip Collier2017-07-241-0/+2
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devSean Harmer2017-07-111-0/+4
|\ \
| * | Merge remote-tracking branch 'origin/5.9' into devAndy Nichols2017-07-111-0/+4
| |\|
| | * Make sure Qt3D gets a clean OpenGL state in Scene3D itemWieland Hagen2017-06-291-0/+4
* | | Introduce QSpriteSheetMike Krus2017-07-089-2/+445
* | | Introduce QSpriteGridMike Krus2017-07-081-0/+3
|/ /
* | Introduce QShaderProgramBuilderKevin Ottens2017-07-051-0/+2
* | Merge branch '5.9' into devSean Harmer2017-06-194-11/+23
|\|
| * Update NodeInstantiator's children on parent updateMauro Persano2017-06-162-0/+15
| * Fix memory leak in Quick3DNodeInstantiatorPrivateMauro Persano2017-06-141-1/+2
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-3/+6
| |\
| | * Don't use a static value for the value type providerv5.9.0-rc2v5.9.0-rc1v5.9.0Sean Harmer2017-05-191-3/+6
| * | Fix context sharing in scene2dMäättä Antti2017-05-271-7/+0
* | | Add LineWidth render stateMauro Persano2017-06-081-0/+2
* | | Refactor job to prepare for line and point pickingMike Krus2017-05-261-0/+2
|/ /
* | Merge branch '5.9.0' into 5.9Sean Harmer2017-05-2025-557/+1882
|\|
| * Fix qmlClearTypeRegistrations for Qt 3DMäättä Antti2017-05-124-1/+13
| * Improve QScene2D documentationsMäättä Antti2017-05-091-6/+91
| * Add quick3d class for VertexBlendAnimationAntti Määttä2017-05-094-2/+204
| * Scene2D cleanup - register pick events when scene is initializedAntti Määttä2017-05-097-102/+99
| * Scene2D cleanup - remove qml engine and sourceMäättä Antti2017-05-094-205/+9
| * Scene3DRenderer: fix race conditionv5.9.0-beta4Paul Lemire2017-05-063-4/+18
| * Scene2D: put picking coordinates back in window coordinatesKevin Ottens2017-05-051-1/+1
| * Add a new mirrored property to QPlane(Mesh|Geometry)Kevin Ottens2017-05-051-0/+2