summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-027-6/+9
|\
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-1/+1
| |\
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0815-37/+94
| | |\
| | * | Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
| * | | Always export scene2d shared objectMäättä Antti2019-01-311-1/+1
| * | | assimp: Provide names for generated child entitiesMichael Brasser2019-01-311-0/+1
| * | | Add revisioned QML registrations for QAttributeMichael Brasser2019-01-311-0/+2
| * | | Doc: Fix external link error for SceneLoaderMichael Brasser2019-01-291-1/+1
| * | | Document that QMetalRoughMaterial has an ES 3 techniqueMichael Brasser2019-01-281-1/+1
| * | | Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2019-01-241-2/+2
* | | | Merge remote-tracking branch 'origin/5.12' into devMike Krus2019-01-234-12/+162
|\| | |
| * | | Avoid repeated warningsMike Krus2019-01-183-4/+153
| * | | Fix issue with invalid texturesMike Krus2019-01-181-8/+9
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-106-35/+17
|\| | |
| * | | Fix env-map less renderingMike Krus2019-01-093-28/+7
| | |/ | |/|
| * | Recompute bounding volumes when buffer changesPaul Lemire2019-01-071-1/+2
| * | Picking: viewport contains check needs to use pos in GL coordinatePaul Lemire2019-01-071-3/+8
| * | QRenderCapture: Prevent crash on shutdown when replies are pendingChristian Andersen2019-01-061-3/+0
* | | QGeometry: add minExtent/maxExtent propertiesPaul Lemire2019-01-076-15/+159
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-011-19/+9
|\| |
| * | configure: adjust to qbase changesOswald Buddenhagen2018-12-311-13/+9
| * | configure: don't add system default library locations to fbxOswald Buddenhagen2018-12-311-6/+0
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-2511-11/+75
|\| |
| * | Fix loading of animation aspect on iOSMike Krus2018-12-203-1/+15
| * | QEnvironmentLight: add uniforms for envmaps sizePaul Lemire2018-12-203-6/+49
| * | QEnvironmentLight: fix wrong getter callPaul Lemire2018-12-191-1/+1
| * | Texture: initialize internal format to NoFormatPaul Lemire2018-12-194-4/+4
| * | QTexture: DDS handle uncompressed floating point format texturesPaul Lemire2018-12-191-0/+6
| * | Fix unfinished commentThiago Macieira2018-12-121-0/+1
| |/
* | Preliminary glTF 2.0 scene import supportMassimo Callegari2018-12-222-152/+635
* | Register revision 13 of QObjectPicker to QMLPaul Lemire2018-12-211-0/+1
* | QShaderProgramBuilder: add properties to access generated shader codePaul Lemire2018-12-145-0/+214
* | QObjectPicker and QPickingSettings NearestPriorityPick picking modePaul Lemire2018-12-1211-32/+212
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-12-1127-154/+408
|\|
| * Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
| * Add missing precision specifiers for ES3Michael Brasser2018-12-052-11/+11
| * Use the correct coordinatesystem include for ES3Michael Brasser2018-12-051-0/+9
| * Update QML import versions in "Qt3D QML Types"Kai Koehne2018-12-051-13/+13
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-2/+22
| |\
| | * Doc: Add QT3D_REGISTER_ASPECT macro documentationPaul Wicking2018-11-062-2/+22
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-043-6/+12
| |\ \
| | * | Reset last selected picker when releasing out of viewportPaul Lemire2018-11-301-1/+7
| | * | Renderer: drawArraysInstancedBaseInstance parameters were swappedPaul Lemire2018-11-282-5/+5
| * | | Add ES3-specific coordinate systems shader fragmentMauro Persano2018-11-082-0/+74
| * | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/stagin...Liang Qi2018-11-082-5/+7
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-082-5/+7
| | |\| |
| | | * | Renderer::doRender scene3dBlocking fixesPaul Lemire2018-11-051-4/+7
| | | * | GLTexture: do not set layers when target is Texture3DPaul Lemire2018-11-021-1/+0
| * | | | Add documentation for QText2DEntityMike Krus2018-11-083-11/+88
| |/ / /
| * | | Documentation: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-073-12/+20