summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QEventFilterService: these aren't the algorithms you're looking forMarc Mutz2019-07-311-16/+12
* QWheelEvent: temporarily disable deprecation warnings around x(), y()Marc Mutz2019-07-311-0/+3
* Fix deprecation warningsMike Krus2019-07-301-11/+0
* ShaderData: don't call markDirty(AllDirty)Paul Lemire2019-07-241-1/+1
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-2316-32/+190
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-1616-32/+190
| |\
| | * Document an example of how textureScale might be usedMichael Brasser2019-07-157-0/+51
| | * QRay3D: normalize the direction vector internallyPaul Lemire2019-07-151-4/+4
| | * 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
* | | assimp plugin: replace QMap with a C arrayMarc Mutz2019-07-222-35/+28
* | | AssimpImporter: remove unused QMapMarc Mutz2019-07-221-2/+0
* | | Remove unused <QMap> includesMarc Mutz2019-07-222-2/+0
* | | Remove unused file gltfparser.cppMarc Mutz2019-07-181-1560/+0
* | | Fix following recent Scene3DRenderer changesPaul Lemire2019-07-161-0/+1
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-2/+3
|\| |
| * | 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
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ /
* | | Fix compilation with -qt3d-profile-jobsPaul Lemire2019-07-151-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-114-49/+137
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-114-49/+137
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-274-49/+137
| | |\|
| | | * Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| | | * Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
* | | | Basic KTX support for Qt 3DMichael Brasser2019-07-093-10/+173
* | | | QShaderImage: fix missing endtable in docPaul Lemire2019-07-091-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-255-13/+92
|\| |
| * | Add doc to undocumented functions qt3dNico Vertriest2019-05-275-13/+92
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-185-5/+37
|\| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-155-5/+37
| |\|
| | * Fix removal of components when they are destroyedMike Krus2019-05-284-2/+34
| | * Fix Parameter priority sortingPaul Lemire2019-05-241-3/+3
* | | Replace QLatin1Literal with QLatin1StringGiuseppe D'Angelo2019-06-116-29/+29
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Paul Lemire2019-06-0337-302/+929
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devPaul Lemire2019-06-0337-302/+929
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-292-8/+8
| | |\|
| | | * Clean up warningsMike Krus2019-05-283-8/+9
| | * | 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-253-0/+184
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-268-9/+165
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-268-9/+165
| | | |\|
| | | | * Update Qt3D color handlingMichael Brasser2019-05-153-2/+95
| | | | * Register Qt3DCore::QNode also for Qt3D.AnimationUlf Hermann2019-05-171-0/+2
| | | | * Doc: Add MetalRoughMaterial QML documentationPaul Wicking2019-05-161-1/+50