summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-028-6/+42
|\
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-1/+34
| |\
| | * Add changelog file for Qt 5.12.1v5.12.1Antti Kokko2019-01-171-0/+33
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0824-41/+284
| | |\
| | * | 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
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-109-37/+62
|\| | |
| * | | Fix env-map less renderingMike Krus2019-01-093-28/+7
| | |/ | |/|
| * | Recompute bounding volumes when buffer changesPaul Lemire2019-01-072-1/+4
| * | Picking: viewport contains check needs to use pos in GL coordinatePaul Lemire2019-01-072-5/+32
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| * | QRenderCapture: Prevent crash on shutdown when replies are pendingChristian Andersen2019-01-062-3/+19
* | | QGeometry: add minExtent/maxExtent propertiesPaul Lemire2019-01-078-15/+242
* | | 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-2515-12/+199
|\| |
| * | texture_property_updates test: specify texture formatPaul Lemire2018-12-211-0/+2
| * | Fix loading of animation aspect on iOSMike Krus2018-12-203-1/+15
| * | QEnvironmentLight: add uniforms for envmaps sizePaul Lemire2018-12-204-6/+147
| * | QEnvironmentLight: fix wrong getter callPaul Lemire2018-12-191-1/+1
| * | Texture: initialize internal format to NoFormatPaul Lemire2018-12-196-5/+28
| * | 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
* | | Only execute SSE alignment tests if we are not doing the AVX alignment testsPaul Lemire2018-12-211-1/+1
* | | Fix overflow in ThreadPooler test when CPU has high number of coresPaul Lemire2018-12-211-3/+3
* | | Register revision 13 of QObjectPicker to QMLPaul Lemire2018-12-211-0/+1
* | | QShaderProgramBuilder: add properties to access generated shader codePaul Lemire2018-12-147-3/+382
* | | QObjectPicker and QPickingSettings NearestPriorityPick picking modePaul Lemire2018-12-1216-33/+648
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-12-1133-157/+541
|\| |
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-201-0/+20
| * | | 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-053-2/+44
| |\ \ \
| | * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+22
| | * | | Doc: Add QT3D_REGISTER_ASPECT macro documentationPaul Wicking2018-11-062-2/+22