summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix sync.profile dependency versioningv1.2.2Simon Hausmann2016-01-251-2/+2
* Remove some manual test appsMiikka Heikkinen2016-01-13163-49031/+1
* Merge branch 'develop'Miikka Heikkinen2015-11-091-10/+0
|\
| * Fix debug-and-release buildFrederik Gladhorn2015-11-061-10/+0
* | Merge branch 'develop'Miikka Heikkinen2015-10-293-1/+4
|\|
| * Fix the leaking framebuffer on graph resizeMiikka Heikkinen2015-10-292-0/+3
| * OpenGL warning fixTomi Korpipää2015-10-271-1/+1
* | Merge branch 'develop'Miikka Heikkinen2015-10-22646-5387/+7058
|\|
| * Fix issues with COIN buildsMiikka Heikkinen2015-10-22267-212/+477
| * Update license headersMiikka Heikkinen2015-10-20468-5148/+6552
| * Fixed OpenGL 3.x crashTomi Korpipää2015-10-191-0/+2
| * Follow Qt 5.6 branchJędrzej Nowacki2015-10-191-2/+2
* | Depend directly on 5.6 branchJędrzej Nowacki2015-10-161-2/+2
* | Merge branch 'develop'Miikka Heikkinen2015-09-289-6/+12
|\|
| * Fix compilation with namespaced Qt.Friedemann Kleint2015-09-219-6/+12
* | Merge branch 'develop'Miikka Heikkinen2015-09-1496-138/+156
|\|
| * Fix compile warnings about shadowMiikka Heikkinen2015-09-146-13/+13
| * Correct file version, description, and product nameMiikka Heikkinen2015-09-112-0/+10
| * Version numbers and change file update for 1.2.2Miikka Heikkinen2015-09-115-9/+15
| * Data member initialization removed from header.Mika Salmela2015-07-032-7/+9
| * Fix building against 5.6Miikka Heikkinen2015-06-1781-109/+109
* | Merge branch 'develop'v1.2.1Miikka Heikkinen2015-04-14479-1403/+2535
|\|
| * Add dist file for 1.2.1 and change version numbersMiikka Heikkinen2015-04-145-9/+18
| * Copyright header changesMika Salmela2015-04-14471-1410/+1410
| * qmlscatter example: Give a default size to the view itemCaroline Chao2015-03-111-0/+2
| * Qt 5.5 fixesTomi Korpipää2015-02-234-0/+1
| * Dust and H2 to galaxyMika Salmela2014-12-124-6/+158
| * Write fps to file.Mika Salmela2014-12-083-5/+39
| * Fixes to galaxy.Mika Salmela2014-12-083-28/+58
| * Improve button width setting on perf tester.Mika Salmela2014-12-041-4/+4
| * Galaxy improvement.Mika Salmela2014-12-043-51/+48
| * Initial version of Galaxy.Mika Salmela2014-12-048-0/+907
* | Merge branch 'develop'v1.2.0Miikka Heikkinen2014-11-211-5/+13
|\|
| * Once more crash fix on texture adding.Mika Salmela2014-11-211-5/+13
* | Merge branch 'develop'Miikka Heikkinen2014-11-211-5/+7
|\|
| * Fix crash when adding a texture on QMLMika Salmela2014-11-211-5/+7
* | Merge branch 'develop'Miikka Heikkinen2014-11-217-13/+18
|\|
| * Minor tweaks to texturesurface example.Miikka Heikkinen2014-11-212-1/+2
| * Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| * Fix invalid enum error in OpenGL ES2 builds.Miikka Heikkinen2014-11-212-10/+4
| * Make customitems example actually show some custom items.Miikka Heikkinen2014-11-212-0/+5
| * Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
* | Merge branch 'develop'Miikka Heikkinen2014-11-1915-28/+28
|\|
| * Fix WinRT issues.Miikka Heikkinen2014-11-1915-28/+28
* | Merge branch 'develop'Miikka Heikkinen2014-11-1817-128/+27
|\|
| * Support larger custom meshes.Miikka Heikkinen2014-11-1814-126/+23
| * Some doc updatesMiikka Heikkinen2014-11-182-1/+3
| * Remove cpp autotests from android builds.Miikka Heikkinen2014-11-171-1/+1
* | Merge branch 'develop'Miikka Heikkinen2014-11-145-42/+42
|\|
| * Fix the required creator versionMiikka Heikkinen2014-11-141-1/+1