summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable IBL override setting for basic materialsHEADmasterMahmoud Badri5 days7-43/+66
* When deleting a datainput, remove bindings without askingJanne Kangas5 days8-33/+49
* Material duplication improvementMahmoud Badri8 days7-99/+101
* Merge "Merge branch '2.4'"Miikka Heikkinen2019-06-112190-315076/+362
|\
| * Merge branch '2.4'Miikka Heikkinen2019-06-112190-315076/+362
| |\ |/ /
| * Implement QML code generator for Datainputs and -outputsJanne Kangas2019-06-113-3/+39
| * Add project directory into window titleKaj Grönholm2019-06-111-3/+13
| * Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-102210-316803/+121
| * Fix black screen after opening another presentationJere Tuliniemi2019-06-071-0/+5
| * Fix Integrity build after type changesJanne Koskinen2019-06-051-1/+1
| * Add examples from runtime 2Pasi Keränen2019-06-0633-1/+1276
| * Support datainput binding in createElementsJanne Kangas2019-06-064-5/+26
| * Copy memory leak fixes from Qt3D runtimeJere Tuliniemi2019-06-062-7/+15
| * Fix distance field shaders on OpenGL ESJere Tuliniemi2019-06-053-9/+5
| * Add Runtime 2 style surfaceFormat method to APIPasi Keränen2019-06-063-2/+148
| * Fix autotestsKaj Grönholm2019-06-053-45/+21
| * Fix indentationAntti Määttä2019-06-051-1843/+1848
| * Fix memory leak in OpenGL runtimeJere Tuliniemi2019-06-054-0/+22
| * Support platform default fboAntti Määttä2019-06-055-9/+23
| * Fix simplewindow exampleAntti Määttä2019-06-051-14/+23
| * Force path normalization to use forward slashesJari Karppinen2019-06-051-0/+5
| * Add accessors for lists of created elements/materials/meshesMiikka Heikkinen2019-06-055-25/+172
| * Clarify material creation/deletion APIMiikka Heikkinen2019-06-0511-91/+141
| * Implement datainput metadata getterJanne Kangas2019-06-0513-8/+198
| * Fix compile warningsMiikka Heikkinen2019-06-041-3/+7
| * Properly detect and generate ibl image mipmapsAntti Määttä2019-06-049-158/+111
| * Add missing documentation to Q3DSPresentationJari Karppinen2019-06-041-7/+4
| * Bump EASTL to latest versionPasi Keränen2019-06-041-0/+0
| * Add API documentation for dynamic element/material/mesh creationMiikka Heikkinen2019-06-041-48/+169
| * Assume QML streams have premultiplied alphaJere Tuliniemi2019-06-031-3/+1
| * Update documentation about 3D assetsv2.4.0-beta2Mats Honkamaa2019-05-249-178/+136
| * Remove Linux specific hacks in subpresentation updateJari Karppinen2019-05-311-10/+0
| * Add missing error string to SurfaceViewer APIJari Karppinen2019-05-313-6/+31
| * Remove subPresentationSettings propertyAntti Määttä2019-06-032-6/+7
| * Disregard UIP -specified name for material references to imagesJanne Kangas2019-06-031-1/+7
* | Merge "Merge branch '2.4'"Miikka Heikkinen2019-06-031030-6133/+3831
|\ \
| * \ Merge branch '2.4'Miikka Heikkinen2019-06-031030-6133/+3831
| |\ \ |/ / / | | _
| * Add ignoredEvents into OpenGL RuntimeKaj Grönholm2019-06-027-49/+121
| * Move shader feature definitionJere Tuliniemi2019-06-031-24/+15
| * Move files required by OpenGL runtime within ogl-runtime directoryPasi Keränen2019-05-311003-927/+1255
| * Fix crash in editor when using qmlstreamsAntti Määttä2019-05-291-3/+11
| * Fix changing animated materials color propertyMahmoud Badri2019-05-291-19/+23
| * Remove extra reset method in SurfaceViewer APIJari Karppinen2019-05-293-30/+19
| * Remove utf8cpp 3rd party lib from Qt 3D StudioPasi Keränen2019-05-2911-2872/+10
| * Update toolbar preview buttons docsMats Honkamaa2019-05-282-4/+8
| * Add initial documentation for 2.4 OpenGL RuntimePasi Keränen2019-05-2916-134/+1987
| * Allow specifying range property precisionMahmoud Badri2019-05-288-50/+49
| * Make Datainput min and max read-onlyJanne Kangas2019-05-286-34/+20
| * Define custom number types with standard Qt typesPasi Keränen2019-05-282-133/+26
| * Merge "Merge branch 'master' into 2.4"Miikka Heikkinen2019-05-283-7/+128
| |\