summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into wip/animationwip/animationSean Harmer2017-05-241715-122907/+241699
|\
| * Add support to move the camera so that the entire model is visibleMike Krus2017-05-2316-7/+493
| * Camera: add pointer back to aspectMike Krus2017-05-233-1/+52
| * Add QNodeCommandMike Krus2017-05-229-2/+391
| * Add support for single shot jobsMike Krus2017-05-223-1/+23
| * Add support for remote content in SceneLoaderMike Krus2017-05-219-38/+180
| * Add support to load data from memory for scene loadersMike Krus2017-05-215-29/+84
| * Merge branch '5.9' into devSean Harmer2017-05-21244-1785/+10989
| |\
| | * Merge branch '5.9.0' into 5.9Sean Harmer2017-05-20169-1001/+9025
| | |\
| | | * Don't use seamless cubemap on GL <3.2Sean Harmer2017-05-171-2/+0
| | | * Ensure normal vector is normalized following interpolationSean Harmer2017-05-161-2/+4
| | | * Match the Blinn-Phong specular power to be consistent with IBLSean Harmer2017-05-162-61/+56
| | | * Improve the roughness to mip level mappingSean Harmer2017-05-162-20/+122
| | | * Renderer: prevent crash in case texture failed to be builtPaul Lemire2017-05-161-0/+2
| | | * Replace undistributable filesRobert Brock2017-05-1650-52/+90
| | | * Fix speed regressions in ES2 shadersOleg Evseev2017-05-161-173/+137
| | | * Fix qmlClearTypeRegistrations for Qt 3DMäättä Antti2017-05-124-1/+13
| | | * Add changes file for 5.9.0Jani Heikkinen2017-05-121-0/+81
| | | * Remove duplicate subdirs target that slipped inSean Harmer2017-05-121-2/+1
| | | * Fix SC breakSean Harmer2017-05-121-0/+8
| | | * Write docs for advanced custom material exampleMäättä Antti2017-05-103-3/+90
| | | * Scene2D example: highlight that QtQuick is a Texture on a MeshPaul Lemire2017-05-103-23/+40
| | | * QNode: setParent create creation change only when neededPaul Lemire2017-05-104-4/+84
| | | * Call setSurfaceFormat after QQuiApplication instance initiationMäättä Antti2017-05-092-2/+2
| | | * Improve QScene2D documentationsMäättä Antti2017-05-091-6/+91
| | | * Add quick3d class for VertexBlendAnimationAntti Määttä2017-05-095-3/+209
| | | * Merge "Merge remote-tracking branch 'origin/5.9' into 5.9.0" into refs/stagin...Jani Heikkinen2017-05-0912-42/+112
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-0812-42/+112
| | | | |\
| | | * | | Add documentation for Scene2D exampleSean Harmer2017-05-094-2/+138
| | | * | | Add scene 2d example to showcase new featureSean Harmer2017-05-097-1/+4577
| | | * | | Scene2D cleanup - register pick events when scene is initializedAntti Määttä2017-05-0911-114/+167
| | | * | | Add autotests for new animation classesAntti Määttä2017-05-0915-2/+1418
| | | * | | Scene2D cleanup - remove qml engine and sourceMäättä Antti2017-05-096-262/+15
| | | |/ /
| | | * | Scene3DRenderer: fix race conditionv5.9.0-beta4Paul Lemire2017-05-063-4/+18
| | | * | Add documentation for simplecustommaterial exampleMäättä Antti2017-05-054-1/+99
| | | * | Update multiviewport example imageMäättä Antti2017-05-053-1/+1
| | | * | Scene2D: put picking coordinates back in window coordinatesKevin Ottens2017-05-052-9/+9
| | | * | Add a new mirrored property to QPlane(Mesh|Geometry)Kevin Ottens2017-05-056-7/+75
| | | * | Apply layer filter to light sourcesLaszlo Agocs2017-05-051-2/+8
| | | * | Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-0438-260/+795
| | | |\ \
| | | * | | Update qmltypes filesMike Krus2017-05-036-244/+1453
| | | * | | Unregister event filter when surface to closeMike Krus2017-05-031-0/+4
| | | * | | Update manual tests for changes in APIMike Krus2017-05-034-6/+6
| | | * | | Correct shader typo for rendering and fix shader selectionMike Krus2017-05-032-4/+3
| | | * | | Use non-template version of QVariant::value (clazy reports)Mike Krus2017-05-026-6/+6
| | | * | | Use multi-arg where possible (clazy reports)Mike Krus2017-05-021-4/+4
| | | * | | Remove unneeded temporary container (clazy reports)Mike Krus2017-05-023-7/+17
| | | * | | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-0211-19/+19
| | | * | | Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-028-33/+33
| | | * | | Add missing emit (clazy reports)Mike Krus2017-05-021-1/+1