summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Remove the Aspect ThreadPaul Lemire2019-08-0717-421/+177
* qshaderimage_p.h: add missing We mean it warningPaul Lemire2019-08-061-0/+11
* QImageTextureDataFunctor: return invalid data when url is invalidWang Chuan2019-08-051-1/+3
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Liang Qi2019-07-3114-18/+162
|\
| * Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-3114-18/+162
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-306-1/+109
| | |\
| | | * 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 remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-239-18/+54
| | |\|
| | | * 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-187-14/+33
* | | | Port from QMutex::Recursive to QRecursiveMutexMarc Mutz2019-07-312-11/+12
* | | | Revert "QWheelEvent: temporarily disable deprecation warnings around x(), y()"Marc Mutz2019-07-311-3/+0
* | | | QMouseEvent: port away from deprecated QWheelEvent::x/y()Marc Mutz2019-07-311-2/+2
|/ / /
* | | 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
|\| |