summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.12' into devSean Harmer2018-10-1141-937/+2231
|\
| * Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-0915-894/+1632
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-0526-43/+617
| |\
| | * Fix normal calculation in MorphPhongMaterialJoni Poikelin2018-10-052-2/+2
| | * Fix compilation with -qt3d-profile-jobs on AndroidPaul Lemire2018-10-051-0/+5
| | * Further complete missing functions on ES3 helpersPaul Lemire2018-10-044-0/+23
| | * Fix leak with VAOManagerPaul Lemire2018-10-033-1/+8
| | * QChangeArbiter: fix leakPaul Lemire2018-10-031-2/+5
| | * Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
| | * Add metalRoughFunction to ES3Mauro Persano2018-09-275-0/+467
| | * ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-271-0/+9
| | * Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-271-0/+9
| | * Scene3D crashing on destructionMichael Dippold2018-09-273-30/+32
| | * QOrbitCameraController: make zoom work when pressing shift keyPaul Lemire2018-09-261-1/+1
| | * Doc: Mark deprecated Qt 3D QML types obsoleteLeena Miettinen2018-09-251-0/+14
| | * QText2DEntity: clear glyphrun when scene changesPaul Lemire2018-09-242-1/+15
| | * GLTexture: mark texture for upload when it's recreated and contains dataPaul Lemire2018-09-241-0/+4
* | | QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-104-0/+101
* | | Introduce QSetFence/QWaitFence to synchronize with 3rd party enginesPaul Lemire2018-10-107-2/+752
* | | Register QSharedGLTexture to qmlPaul Lemire2018-10-081-0/+1
* | | Add QSharedGLTexturePaul Lemire2018-10-086-1/+94
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-0520-52/+256
|\| |
| * | Replace use of qmlRegisterRevisionKai Koehne2018-10-041-1/+1
| * | Add private export to GraphicsApiFilterDatav5.12.0-beta1Svenn-Arne Dragly2018-10-021-1/+1
| * | Doc: Use a macro to resolve QML import versionsTopi Reinio2018-09-268-32/+32
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-2210-18/+222
| |\|
| | * Complete ES 3.1 and 3.2 helpersPaul Lemire2018-09-217-3/+208
| | * Replace use of qmlRegisterRevisionKai Koehne2018-09-203-15/+14
* | | Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-241-0/+9
* | | ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-241-0/+9
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-221-2/+0
|\| |
| * | Quick3DEntityLoaderPrivateSubject: Fix warning about unused variableFriedemann Kleint2018-09-171-2/+0
* | | Dont play animations that are disabledJuan Jose Casafranca2018-09-191-0/+2
* | | Add an easy way to get a particular component from an entityJuan Jose Casafranca2018-09-192-0/+20
|/ /
* | Automatically register the latest import versionKai Koehne2018-09-0616-8/+32
* | Fix warning about ignored qualifiersThiago Macieira2018-09-051-1/+1
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-042-2/+2
|\|
| * Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-292-2/+2
* | Add private API to access child nodes of QEntity and QFrameGraphNodeSvenn-Arne Dragly2018-09-036-2/+70
* | Move forward declaration of QMetaObject inside Qt namespaceSvenn-Arne Dragly2018-09-031-2/+2
* | Privately export ShaderBuilderPaul Lemire2018-08-291-1/+1
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-08-254-8/+8
|\|
| * Fix: remove compile warning in graphicscontext.cppPaul Lemire2018-08-211-1/+1
| * Doc: Fix Scene2D and Scene3D QML modules uriTakumi ASAKI2018-08-173-7/+7
* | Renderer: remove code shutting down thread in renderer dtorPaul Lemire2018-08-201-4/+2
* | EntityLoader: add sourceComponent propertyPaul Lemire2018-08-204-5/+56
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-1716-147/+210
|\|
| * Doc: Fix incorrect ForwardRenderer properties typeTakumi ASAKI2018-08-171-2/+2
| * Remove AUTOTEST_EXPORT from templated functionLaszlo Agocs2018-08-151-1/+1
| * Avoid initializing GraphicsContext on every frameLaszlo Agocs2018-08-142-4/+1