aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmakeLaszlo Agocs2019-12-13668-30019/+26100
|\
| * Merge remote-tracking branch 'origin/5.15' into devLaszlo Agocs2019-12-13667-30017/+26098
| |\
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Laszlo Agocs2019-12-1290-623/+1194
| | |\
| | | * Add using statements for Qt::endl and Qt::hex for future-compatMårten Nordheim2019-12-125-0/+24
| | | * QmlDesigner: Adjust item library templatesThomas Hartmann2019-12-122-9/+9
| | | * Dirty front-end objects when rendernode is createdMiikka Heikkinen2019-12-1125-11/+99
| | | * Fix loading of res.qrc in static buildsJanne Koskinen2019-12-111-0/+1
| | | * Add environment flags : QUICK3D_FORCE_OPENGL_BACKENDInho Lee2019-12-061-11/+31
| | | * QmlDesigner: Integrate EditableListViewHenning Gruendl2019-12-061-0/+15
| | | * Fix image preparation stepChristian Strømme2019-12-062-2/+10
| | | * Qt Quick content in 3DInho Lee2019-12-0516-0/+734
| | | * Doc: Fix some typos and grammar and formatting issuesLeena Miettinen2019-12-041-20/+20
| | | * Do glFinish only if QUICK3D_RENDERTIMES is setJere Tuliniemi2019-12-021-3/+6
| | | * QmlDesigner: PropertyEditor cleanupHenning Gruendl2019-12-0213-463/+370
| | | * QQuick3DNode: use sceneRotationMatrix() in rotate() functionRichard Moe Gustavsen2019-11-291-4/+3
| | | * Revert "{endl,hex} => Qt::{endl,hex}"Tim Jenssen2019-11-295-199/+199
| | | * Use relative path in .gitmodules for assimp repositoryJoerg Bornemann2019-11-281-1/+1
| | | * QQuick3dExample hellocube : remove unnecessary codeInho Lee2019-11-281-5/+0
| | | * {endl,hex} => Qt::{endl,hex}Mårten Nordheim2019-11-285-199/+199
| | | * Remove wasd exampleKaj Grönholm2019-11-287-274/+0
| | | * QQuick3DNode: change sceneRotation implementationRichard Moe Gustavsen2019-11-282-3/+37
| | | * Example, Studio: move the example it into manual tests insteadRichard Moe Gustavsen2019-11-2817-1/+0
| | | * QSSGEulerAngleConverter: use Q_UNREACHABLERichard Moe Gustavsen2019-11-281-2/+2
| | | * Update model geometry after the node changesAntti Määttä2019-11-284-1/+13
| | | * Add OpenGL ES 3.2 context queryAntti Määttä2019-11-281-1/+20
| | | * Remove header from wrong pro-fileAntti Määttä2019-11-281-1/+0
| | | * Fix transparent clear with inline render modeAntti Määttä2019-11-281-2/+3
| | | * Simplification for unused codesInho Lee2019-11-283-24/+10
| | * | Remove non-existent fileMårten Nordheim2019-11-281-1/+0
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Laszlo Agocs2019-11-279-900/+171
| | |\|
| | | * Clean up Layer rendering (Remove all advanced blend modes)Andy Nichols2019-11-279-900/+171
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Laszlo Agocs2019-11-2716-1254/+104
| | |\|
| | | * Remove more unnecessary offscreen rendering codeAndy Nichols2019-11-2610-100/+43
| | | * Clean up Renderer codeAndy Nichols2019-11-2616-1146/+69
| | | * Remove isSubpresentation from RenderContextAndy Nichols2019-11-261-4/+0
| | | * Remove authoringMode from RenderContextAndy Nichols2019-11-261-9/+0
| | | * Remove unused matteColor from RenderContextAndy Nichols2019-11-262-5/+2
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Christian Strømme2019-11-26281-1998/+4547
| | |\|
| | | * Merge "Merge remote-tracking branch 'origin/5.14.0' into 5.14"Christian Strømme2019-11-2649-475/+1136
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Christian Strømme2019-11-2649-475/+1136
| | | | |\
| | | | | * Add fully custom material exampleJere Tuliniemi2019-11-2511-0/+592
| | | | | * Add custom vertex shader documentationJere Tuliniemi2019-11-251-0/+69
| | | | | * Change shader uniform namesJere Tuliniemi2019-11-2537-475/+475
| | | * | | Fix import version to work with Design StudioMiikka Heikkinen2019-11-262-4/+4
| | | |/ /
| | | * | QtQuick3D Example (Hellocube) : improvementInho Lee2019-11-255-58/+85
| | | * | Fix 3D View in QDS snapshotsThomas Hartmann2019-11-213-6/+6
| | | |/
| | | * Revert "Update import statements"Henning Gruendl2019-11-2033-38/+38
| | | * Remove the vertexLighting mode in the materialsChristian Strømme2019-11-208-18/+6
| | | * Doc: Fix typo in lighting documentationChristian Strømme2019-11-202-4/+4
| | | * Add asset conditioning docsTomi Korpipaa2019-11-2038-1/+1211
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 10:35:42 +0000