summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults
Commit message (Expand)AuthorAgeFilesLines
* Reset input axis changes when enabling camera controllerMike Krus2019-09-301-0/+4
* Disable frame action when camera controller is disabledMike Krus2019-09-041-1/+2
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-315-10/+10
|\
| * Minor fixes for QSprite* classesMichael Brasser2019-08-303-6/+6
| * Update MetalRoughMaterial documentionMichael Brasser2019-08-291-3/+3
| * Add missing * for SkyboxEntity QML type documentationMats Honkamaa2019-08-261-1/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-301-0/+45
|\|
| * Add QML documentation to QSkyboxEntityPaul Lemire2019-07-241-0/+45
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-166-0/+31
|\|
| * Document an example of how textureScale might be usedMichael Brasser2019-07-156-0/+31
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-1/+8
|\|
| * Doc: Extend Qt3D documentationPaul Wicking2019-06-071-1/+8
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-261-1/+50
|\|
| * Doc: Add MetalRoughMaterial QML documentationPaul Wicking2019-05-161-1/+50
* | Switch export macros to standard formKai Koehne2019-04-0224-24/+24
|/
* Doc: clarify some propertiesJoni Poikelin2019-02-143-17/+36
* Document that QMetalRoughMaterial has an ES 3 techniqueMichael Brasser2019-01-281-1/+1
* Fix env-map less renderingMike Krus2019-01-092-28/+0
* Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
* Doc: Fix various documentation warningsTopi Reinio2018-11-071-0/+2
* Qt3DWindow: Redraw scene on expose events when using OnDemand renderingChristian Andersen2018-11-062-0/+16
* Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
* QOrbitCameraController: make zoom work when pressing shift keyPaul Lemire2018-09-261-1/+1
* Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-291-1/+1
* Doc: Fix incorrect ForwardRenderer properties typeTakumi ASAKI2018-08-171-2/+2
* QSkyboxEntity fixes:Paul Lemire2018-07-181-3/+3
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-8/+8
* Add support for Escape key in camera controllersMike Krus2018-04-204-0/+23
* Enable alpha blending on QTextureMaterialMike Krus2018-03-083-0/+62
* Revert "CameraControllers: use the Camera's upVector"Sean Harmer2018-02-192-2/+2
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-0/+1
|\
| * QAbstractCameraController: Make struct InputState publicFriedemann Kleint2018-02-091-0/+1
* | CameraControllers: use the Camera's upVectorPaul Lemire2018-02-022-2/+2
* | Merge branch '5.10' into devSean Harmer2018-01-175-9/+9
|\|
| * Fix includes of Qt classesFriedemann Kleint2018-01-153-6/+6
| * Merge branch '5.9' into 5.10Sean Harmer2018-01-122-3/+3
| |\
| | * Fix includes of Qt classesFriedemann Kleint2017-11-232-2/+2
* | | Merge remote-tracking branch 'origin/5.10' into devLaszlo Agocs2017-12-1320-20/+54
|\| |
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+18
| |\ \
| | * \ Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-2011-0/+742
| | |\ \
| | * | | Fix resource init namespace issuesLaszlo Agocs2017-11-142-6/+16
| | * | | Fix material system qrc in static buildsLaszlo Agocs2017-11-082-0/+8
| * | | | Doc: Qt 3D Extras: Fix information on deprecated classesTopi Reinio2017-12-0516-9/+16
| * | | | QSkyboxEntity: try to reload texture only oncePaul Lemire2017-11-212-11/+20
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-2011-0/+742
|\| | |
| * | | Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-1511-0/+742
| |/ /
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-1318-26/+172
|\| |
| * | Remove qfirstpersoncameracontroller_p.h from defaults.priFriedemann Kleint2017-10-201-1/+0
| * | Connect the normal parameter to the right signalKevin Ottens2017-10-131-1/+1
| * | Have all the Phong variations based on a graphKevin Ottens2017-10-1313-21/+142