summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge branch '5.12' into dev" into refs/staging/devSean Harmer2018-10-1145-1251/+2245
|\
| * Merge branch '5.12' into devSean Harmer2018-10-1145-1251/+2245
| |\
| | * 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-0530-357/+631
| | |\
| | | * 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
| | | * Remove unused CameraController.qml from simple-qml exampleKai Koehne2018-10-023-314/+0
| | | * 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
| | | * Document third party asset 'miramar'Kai Koehne2018-09-241-0/+14
* | | | Renderer: implement using OpenGL textures from a texture idPaul Lemire2018-10-1116-72/+1186
|/ / /
* | | QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-105-0/+341
* | | Introduce QSetFence/QWaitFence to synchronize with 3rd party enginesPaul Lemire2018-10-1012-3/+1318
* | | Register QSharedGLTexture to qmlPaul Lemire2018-10-082-0/+3
* | | Add QSharedGLTexturePaul Lemire2018-10-0811-1/+300
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-0522-54/+277
|\| |
| * | Update name of emscripten platform in requires conditionEskil Abrahamsen Blomfeldt2018-10-041-1/+1
| * | 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-2211-19/+242
| |\|
| | * Complete ES 3.1 and 3.2 helpersPaul Lemire2018-09-218-4/+228
| | * 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-192-9/+49
* | | Add an easy way to get a particular component from an entityJuan Jose Casafranca2018-09-193-0/+53
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| |
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\|
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-09-061-0/+24
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-0823-19/+43
|\| | |
| * | | 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-038-18/+147
| * | Move forward declaration of QMetaObject inside Qt namespaceSvenn-Arne Dragly2018-09-031-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 02:05:02 +0000