summaryrefslogtreecommitdiffstats
path: root/src/quick3d
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into wip/qtquickintegrationSean Harmer2017-01-203-0/+28
|\
| * Quick3DExtras: register Text3DGeometry, Text3DMeshPaul Lemire2017-01-131-0/+5
| * Quick3DBuffer: add helper method to read binary filePaul Lemire2017-01-132-0/+23
* | Add scene2d to quick3drenderAntti Määttä2017-01-182-0/+6
|/
* Merge branch '5.8' into devSean Harmer2017-01-101-1/+10
|\
| * Update EntityLoader docsAntti Määttä2017-01-101-1/+10
* | Merge branch '5.8' into devSean Harmer2016-12-214-3/+12
|\|
| * Merge branch '5.8.0' into 5.8Sean Harmer2016-12-164-3/+12
| |\
| | * Only pass static metaobjects around and fix EntityLoaderPaul Lemire2016-12-162-1/+8
| | * RenderCapture: register with version 2.1Paul Lemire2016-12-071-2/+2
| | * Export AxisAccumulator to QMLSean Harmer2016-12-071-0/+2
* | | Add missing emit keyword when calling signalsSergio Martins2016-12-181-9/+9
|/ /
* / Doc: Specify #include path for each \classTopi Reinio2016-12-071-0/+1
|/
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-282-4/+4
|\
| * Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-242-2/+2
| |\
| | * NodeInstantiator created nodes go to its parentv5.7.1Kevin Ottens2016-10-141-1/+1
| | * Give access to FrameGraphNode as a grouping nodeKevin Ottens2016-10-141-1/+1
| * | Fix NodeInstantiator::objectAdded docsDaniel Vrátil2016-11-011-2/+2
| |/
* | ContextSaver dtor: call make current only when neededPaul Lemire2016-11-231-1/+1
* | Scene3DRenderer::render: simplified code pathsPaul Lemire2016-11-231-28/+19
* | Scene3DItem: no need to destoy the SGNode on size changePaul Lemire2016-11-231-11/+7
* | Remove CONFIG+=static when gcov is enabledPaul Lemire2016-11-234-4/+0
* | LCOV exclusion comments squashedPaul Lemire2016-11-235-5/+5
* | Fix crash in Scene3DRenderer::shutdown caused by nullptr m_aspectEngineFredrik Orderud2016-11-021-2/+4
* | Introduce OneMinusSource1ColorKevin Ottens2016-10-291-1/+1
* | Merge branch '5.7' into 5.8Sean Harmer2016-10-106-135/+1393
|\|
| * Update QML type information for Qt CreatorKevin Ottens2016-09-266-135/+1393
* | Skybox examples: do not mirror imagesPaul Lemire2016-10-101-6/+6
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-201-9/+9
|\|
| * Fix camera controllersMiikka Heikkinen2016-09-051-9/+9
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-051-5/+22
|\|
| * Update QEntity docsAntti Määttä2016-09-021-5/+22
* | MSVC2015_64 "internal compiler error" fixesv5.8.0-alpha1Tomi Korpipää2016-08-313-7/+8
* | Enable QRenderCapture usage in the backendAntti Määttä2016-08-291-0/+3
* | OrbitCameraController: disable logical device when disabledPaul Lemire2016-08-271-0/+1
* | FirstPersonCameraController: disabled logical device when disabledPaul Lemire2016-08-271-0/+1
* | Improve robustness of QML plugin loadingSimon Hausmann2016-08-266-6/+6
* | QSkyboxEntity: remove camera translation propertyPaul Lemire2016-08-261-7/+1
* | ForwardRenderer: allow to disable frustum cullingPaul Lemire2016-08-261-0/+2
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-231-1/+7
|\|
| * PhongAlphaMaterial: allow to specify the blending argumentsPaul Lemire2016-08-191-1/+7
* | Merge dev into 5.8Oswald Buddenhagen2016-08-224-8/+0
|\ \
| * | Adjust to qtConfig() changes in qtbaseLiang Qi2016-08-214-8/+0
* | | Qt3DExtras: ForwardRenderer.qml add alias tfor external target sizePaul Lemire2016-08-191-0/+1
|/ /
* | Merge branch '5.7' into devSean Harmer2016-08-144-74/+11
|\|
| * Avoid code dup. in Scene3DItem and Qt3DQuickWindowKevin Ottens2016-08-073-70/+11
| * Remove qboundingvolumedebugSean Harmer2016-08-041-4/+0
* | Add partial data update support for QBufferOleg Evseev2016-08-133-10/+23
|/
* Fix NormalDiffuseMapAlpha materialPaul Lemire2016-07-224-7/+119
* Use trilinear filtering for normal mapsSean Harmer2016-07-213-3/+3