summaryrefslogtreecommitdiffstats
path: root/src/quick3d
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into wip/physicsSean Harmer2017-05-24148-1655/+4862
|\
| * 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
| | * Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-041-0/+2
| | |\
| | * | Update qmltypes filesMike Krus2017-05-036-244/+1453
| | * | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-021-2/+2
| * | | Implement PIMPL for Qt3DQuickWindowJere Tuliniemi2017-05-154-43/+138
| | |/ | |/|
| * | Fix build for -no-feature-wheeleventStephan Binner2017-04-271-0/+2
| |/
| * Add plugins.qmltypes file for scene2dMäättä Antti2017-04-121-0/+121
| * Add skeleton documentation for scene2d moduleMäättä Antti2017-04-121-4/+4
| * Export QAnimationClip to QMLSean Harmer2017-04-111-0/+2
| * Silence warning about unused parameterThiago Macieira2017-04-081-0/+1
| * Fix warning about cast from ASCIIThiago Macieira2017-04-081-1/+1
| * Silence ICC warning about unused local variableThiago Macieira2017-04-071-1/+1
| * Hook Scene3D cleanup on scenegraphInvalidated tooLaszlo Agocs2017-04-052-10/+24
| * Fix Scene3D initialization in QQuickWidgetLaszlo Agocs2017-04-032-2/+23
| * Fix QML registration of QAnimationClipLoaderSean Harmer2017-04-031-1/+1
| * Merge branch '5.8' into 5.9Sean Harmer2017-04-0292-285/+330
| |\
| | * Coding convention fix for Src/importscore, importsextras,5.8Robert Brock2017-04-0117-129/+135
| | * Coding convention fix for Src/Quick3DRobert Brock2017-04-0175-145/+182
| * | Change some Scene3D/Window qWarnings to qCDebugv5.9.0-beta1Laszlo Agocs2017-03-315-7/+125
| * | Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-312-2/+2
| * | Remove clips property from QAbstractClipBlendNode and friendsSean Harmer2017-03-264-186/+1
| * | Fix scene2d mouse event coordinate calculationAntti Määttä2017-03-231-3/+4
| * | Fix flaky autotest tst_scene2dAntti Määttä2017-03-231-4/+8
| * | Scene2D::sceneChangeEvent: handle grabMouseShawn Rutledge2017-03-211-1/+1
| * | scene2d: Add qcoreapplication.h to header includesMikko Gronoff2017-03-201-0/+1
| * | Cleanup scene2d - remove event forwardAntti Määttä2017-03-151-2/+0
| * | Don't call QWindow::create() from the constructorSean Harmer2017-03-151-1/+0
| * | Fix clang warnings in Scene2DMike Krus2017-03-064-14/+12
| * | Fix crash in scene2d when using angleAntti Määttä2017-03-061-0/+4
| * | cleanup scene2d - change mouse event handlingAntti Määttä2017-03-0312-9/+418
| * | Export QClipBlendValue to QMLSean Harmer2017-03-021-0/+2
| * | Cleanup scene2d - remove duplicate ifndefAntti Määttä2017-02-281-4/+0
| * | Enumerize event idsAntti Määttä2017-02-287-41/+117
| * | Split scene2d implementation to multiple filesAntti Määttä2017-02-289-536/+793
| * | Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-2821-28/+582
| * | Rename QAdditiveBlend -> QAdditiveClipBlendSean Harmer2017-02-241-2/+2
| * | Rename QLerpBlend to QLerpClipBlendSean Harmer2017-02-241-2/+2
| * | Introduce QAbstractAnimationClip and rename QAnimationClipSean Harmer2017-02-243-21/+23
| * | Expose QEnvironmentLight to QMLKevin Ottens2017-02-241-0/+2
| * | QShaderData: fix texture support in propertiesKevin Ottens2017-02-241-5/+3
| * | QBoundingSphere cleanupPaul Lemire2017-02-243-9/+16