summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devwip/particlesLiang Qi2016-09-23124-2363/+5748
|\
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-2042-894/+2065
| |\
| | * QTechnique fix: was sending wrong change typePaul Lemire2016-09-191-1/+1
| | * Update QClearbuffers docsAntti Määttä2016-09-091-25/+31
| | * Fix QCameraLens moduleAntti Määttä2016-09-091-2/+2
| | * Fix non-symmetric extents and resolutions for QCuboidMeshMiikka Heikkinen2016-09-082-29/+185
| | * ShaderData: add getter to retrieve transform type of propertiesPaul Lemire2016-09-074-21/+26
| | * Add unit tests for LoadSceneJobPaul Lemire2016-09-073-1/+301
| | * LoadSceneJob: set the status after the subtreePaul Lemire2016-09-071-7/+9
| | * Update QRenderPass docsAntti Määttä2016-09-062-41/+75
| | * ShaderData: refactoringPaul Lemire2016-09-056-140/+132
| | * Update QTechnique docsAntti Määttä2016-09-051-31/+59
| | * Update QMaterial docsMiikka Heikkinen2016-09-051-38/+42
| | * Update QShaderProgram docsMiikka Heikkinen2016-09-051-65/+74
| | * Update QFilterKey docsMiikka Heikkinen2016-09-051-16/+24
| | * Fix documentation of QRenderSettings and QPickingSettingsMiikka Heikkinen2016-09-052-52/+133
| | * Update QEffect docsMiikka Heikkinen2016-09-051-11/+29
| | * Improve QInputSettings docsMiikka Heikkinen2016-09-051-34/+22
| | * Update QMouseDevice docsAntti Määttä2016-09-051-23/+40
| | * Update QFrameAction docsAntti Määttä2016-09-051-8/+18
| | * Update QCameraSelector docsAntti Määttä2016-09-051-14/+24
| | * Update QSortPolicy docsAntti Määttä2016-09-051-26/+37
| | * Update QFrameGraphNode docsAntti Määttä2016-09-051-10/+99
| | * Update QCameraLens docsAntti Määttä2016-09-051-125/+162
| | * Update QSceneLoader docsAntti Määttä2016-09-051-54/+76
| | * Update QViewport docsAntti Määttä2016-09-051-22/+32
| | * Fix QForwardRenderer docsMiikka Heikkinen2016-09-051-29/+70
| | * Fix camera controllersMiikka Heikkinen2016-09-055-16/+295
| | * Remove excess slashes from include statementsMiikka Heikkinen2016-09-053-5/+5
| | * Update QLayerFilter docsAntti Määttä2016-09-051-15/+17
| | * Update QRenderSurfaceSelector docsAntti Määttä2016-09-051-33/+59
| * | Renamed files quniformvalue* to shaderparameterpackPaul Lemire2016-09-168-13/+13
| * | GraphicsContext/Helpers: remove bindUniformPaul Lemire2016-09-1415-742/+7
| * | Parameter: only store a UniformValuePaul Lemire2016-09-142-9/+0
| * | Renderer: get rid of QVariant for backend uniformsPaul Lemire2016-09-149-243/+203
| * | MouseDevice: add wheel axes handlingPaul Lemire2016-09-083-1/+23
| * | Add Wheel axes to QMouseDevicePaul Lemire2016-09-082-5/+14
| * | GraphicsHelperGL3_3: small fixes + autotest exportPaul Lemire2016-09-082-1/+19
| * | GraphicsHelperGL4: add missing supported featuresPaul Lemire2016-09-081-0/+2
| * | UniformType: add Q_DECLARE_METATYPE for unit testsPaul Lemire2016-09-081-0/+2
| * | GraphicHelpers: add helper methods to get UniformType from GLTypePaul Lemire2016-09-0711-0/+366
| * | GraphicsHelperGL2: fix code indentationPaul Lemire2016-09-071-11/+11
| * | Parameter: store a UniformValuePaul Lemire2016-09-072-0/+10
| * | GraphicsContext: add methods to use UniformValuePaul Lemire2016-09-072-0/+81
| * | Unit tests for UniformValuePaul Lemire2016-09-073-1/+307
| * | Add UniformValue classSean Harmer2016-09-073-2/+374
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-0544-433/+2116
| |\ \ | | |/
| | * Update QEntity docsAntti Määttä2016-09-022-26/+45
| | * Update QTextureImage docsAntti Määttä2016-09-023-21/+137
| | * Remove unimplemented function from QBlendEquationArgumentsMiikka Heikkinen2016-09-021-1/+0