summaryrefslogtreecommitdiffstats
path: root/src/quick3d
Commit message (Expand)AuthorAgeFilesLines
* Register QMorphPhongMaterial for qmlAntti Määttä2017-02-131-0/+2
* Quick3DEntity: use dedicated list of QML componentsPaul Lemire2017-02-122-3/+5
* Initialize members in Scene3DRendererSean Harmer2017-02-121-0/+2
* Initialize members in Scene3DSGMaterialShaderSean Harmer2017-02-122-0/+8
* Fix Clang warnings: out of order initializationMike Krus2017-02-111-3/+3
* Move animations from extras to animationsAntti Määttä2017-02-0714-125/+126
* Quick3DExtras: fix QAbstractAnimation import versionPaul Lemire2017-02-061-1/+1
* Fix iOS static buildMike Krus2017-02-051-1/+0
* Merge "Merge branch 'wip/animation' into dev" into refs/staging/devSean Harmer2017-01-3115-4/+990
|\
| * Merge branch 'wip/animation' into devSean Harmer2017-01-3115-4/+990
| |\
| | * Animation support for Qt3DAntti Määttä2017-01-3115-2/+994
* | | Renamed QAddBlend to QAdditiveBlendPaul Lemire2017-01-311-2/+2
|/ /
* | Updating Qt3D.Extras qmltypesKevin Ottens2017-01-311-0/+162
* | Uniform color PBR lighting to Qt3DExtrasKevin Ottens2017-01-311-0/+2
* | Transfers gpu buffer data to cpuJuan José Casafranca2017-01-311-0/+2
* | QDistanceFieldText: export to QMLPaul Lemire2017-01-302-3/+7
* | Quick3DAnimations: register QAddBlendPaul Lemire2017-01-301-0/+2
* | Fix texture binding on macosAntti Määttä2017-01-301-4/+11
* | Fix scene2d autotest shutdown crashAntti Määttä2017-01-301-3/+5
* | Merge branch 'wip/animation' into devSean Harmer2017-01-3015-0/+928
|\|
| * Register QAbstractClipBlendNode and QLerpBlend to QMLPaul Lemire2017-01-294-2/+190
| * Add API to map animation channels to propertiesSean Harmer2017-01-275-0/+194
| * Add animation componentsSean Harmer2017-01-271-0/+6
| * Register QAnimationClip with QMLSean Harmer2017-01-271-0/+2
| * Add animation aspect importsSean Harmer2017-01-254-0/+139
| * Merge branch 'dev' into wip/animationSean Harmer2017-01-257-3/+256
| |\
| * | Add skeleton quick3danimation librarySean Harmer2017-01-206-0/+399
* | | Merge branch 'wip/qtquickintegration' into devSean Harmer2017-01-2910-2/+1659
|\ \ \
| * | | Fix qml registration versionAntti Määttä2017-01-271-1/+1
| * | | Change renderOnce to RenderPolicy enumAntti Määttä2017-01-275-33/+43
| * | | Add QmlEngine contructor parameter to Scene2DAntti Määttä2017-01-273-4/+55
| * | | Use only one thread in the scene2d rendererAntti Määttä2017-01-264-23/+44
| * | | Register scene2d qml typeAntti Määttä2017-01-261-0/+5
| * | | Resend render event when texture is not in useAntti Määttä2017-01-261-0/+1
| * | | Add Scene2D logging categoryAntti Määttä2017-01-264-5/+121
| * | | Fix scene2d unit testsAntti Määttä2017-01-262-9/+11
| * | | Fix qscene2d autotestsAntti Määttä2017-01-261-5/+10
| * | | Update scene2d implementationAntti Määttä2017-01-266-208/+280
| * | | Register EventForward qml typeAntti Määttä2017-01-251-0/+2
| * | | Change namespaceAntti Määttä2017-01-245-24/+44
| * | | Move scene2d to quick3drenderAntti Määttä2017-01-245-0/+1346
| * | | Merge branch 'dev' into wip/qtquickintegrationSean Harmer2017-01-203-0/+28
| |\| |
| * | | Add scene2d to quick3drenderAntti Määttä2017-01-182-0/+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-2710-86/+476
* | | | Allow Quick3DEntityLoader to work when created from C++Kevin Ottens2017-01-271-5/+34
* | | | Remove FirstPersonCameraController.qmlKevin Ottens2017-01-273-194/+2
* | | | Remove OrbitCameraController.qmlKevin Ottens2017-01-273-238/+4