summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * ShaderData: don't call markDirty(AllDirty)Paul Lemire2019-07-241-1/+1
| * Add QML documentation to QSkyboxEntityPaul Lemire2019-07-241-0/+45
| * Provide more detail in *Light documentationMichael Brasser2019-07-234-0/+63
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2324-23/+915
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2324-23/+915
|/| | | |/
| * Silence warnings about null textures in uniformsMike Krus2019-07-221-0/+6
| * Renderer: use last known good surface to reset render statesPaul Lemire2019-07-191-1/+1
| * Align RenderView::buildComputeRenderCommands with buildDrawRenderCommandsPaul Lemire2019-07-191-3/+14
| * RenderStates: fix override of nested RenderStatesPaul Lemire2019-07-1822-19/+894
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-1617-50/+208
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-1617-50/+208
|/| | | |/
| * Document an example of how textureScale might be usedMichael Brasser2019-07-157-0/+51
| * QRay3D: normalize the direction vector internallyPaul Lemire2019-07-152-22/+22
| * Take shortest path on quaternion slerpJuan Jose Casafranca2019-07-153-12/+38
| * Joints: remove removed joints from dirty listPaul Lemire2019-07-153-0/+8
| * Expand documentation for CameraMichael Brasser2019-07-121-15/+88
| * Doc: Fix typo in property namePaul Wicking2019-07-101-1/+1
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-2/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-2/+2
| |\|
| | * Document unit for FrameAction::triggeredMichael Brasser2019-07-031-2/+2
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ /
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-285-49/+157
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-275-49/+157
|/| | | |/
| * Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| * Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| |/|
| | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | * Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-2/+95
| | |\
| | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
* | | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+26
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+26
|/| | | |
| * | | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-101-0/+26
* | | | | Add doc to undocumented functions qt3dNico Vertriest2019-05-275-13/+92
* | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-157-6/+368
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-157-6/+368
|/| | | | | | | |/ / / | |/| | |
| * | | | Fix removal of components when they are destroyedMike Krus2019-05-285-3/+44
| * | | | Fix Parameter priority sortingPaul Lemire2019-05-242-3/+324
* | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-05-2970-25104/+12
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-2970-25104/+12
|/| | | | | | |/ / / /
| * | | | Clean up warningsMike Krus2019-05-285-11/+13
| * | | | Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
* | | | | Merge "Merge branch '5.12' into 5.13"Paul Lemire2019-05-281-1/+1
|\ \ \ \ \
| * | | | | Merge branch '5.12' into 5.13Paul Lemire2019-05-281-1/+1
|/| | | | | | |/ / / /
| * | | / QClearBuffers: fix wrong clearColor qml property name in docPaul Lemire2019-05-241-1/+1
| | |_|/ | |/| |
* | | | Clean up bounding box updatesMike Krus2019-05-251-37/+41
* | | | Introduce EntityAccumulatorMike Krus2019-05-254-1/+240
* | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-268-9/+165
|\ \ \ \