summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Application
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.3' into wip/runtime2Miikka Heikkinen2019-03-0113-407/+1044
|\
| * TimeEditDlg, DurationEditDlg fixesMahmoud Badri2019-02-265-135/+144
| * Implement variants UI on the slide viewMahmoud Badri2019-02-211-0/+1
| * Implement variants UI on the timeline rowsMahmoud Badri2019-02-201-42/+65
| * Variants: use QHash instead of QVectorMahmoud Badri2019-02-182-76/+24
| * implement variants import and export featuresMahmoud Badri2019-02-182-49/+99
| * Fix variants tags property update issueMahmoud Badri2019-02-181-13/+57
| * Only highlight the properties with nonmatching datainput datatypeJanne Kangas2019-02-181-5/+12
| * Implement variants tags inspector workMahmoud Badri2019-02-113-0/+636
| * Add metadata field to datainput definitionJanne Kangas2019-02-075-1/+88
| * Fix noncanonical uia/uip file savingTomi Korpipaa2019-02-071-0/+3
| * Indicate datatype mismatches in datainput management dialogJanne Kangas2019-02-041-1/+31
| * Fix 'set keyframe time' dialog issueMahmoud Badri2019-01-302-104/+54
| * Add HiDPI icon supportTomi Korpipaa2019-01-231-0/+1
| * Show all ms digits in time adjustment dialogsKaj Grönholm2019-01-182-3/+8
| * Timeline clean upsMahmoud Badri2019-01-174-217/+60
* | Merge branch 'master' into wip/runtime2Miikka Heikkinen2019-01-178-66/+207
|\|
| * Implement 'save project as' and 'duplicate presentation'Miikka Heikkinen2019-01-104-35/+113
| * Enable setting datainput controller from timeline context menuJanne Kangas2019-01-102-4/+19
| * Update global datainput map before triggering property updatesJanne Kangas2018-12-202-3/+13
| * Use original presentation id when importing a presentationMiikka Heikkinen2018-12-191-5/+5
| * Track selection properly on chooser dialogsMiikka Heikkinen2018-12-132-0/+11
| * Merge branch '2.2'Miikka Heikkinen2018-12-112-1/+5
| |\
| | * Don't start playback when interacting with sceneKaj Grönholm2018-12-041-0/+4
| | * Do not assert on datainput bind type parsing on custom materialsJanne Kangas2018-12-041-1/+1
| * | Show a specific warning dialog when user deletes in-use datainputsJanne Kangas2018-12-052-18/+42
* | | Convert synchronous rendering to asynchronousMäättä Antti2019-01-111-2/+1
* | | Cleanup unused codesMäättä Antti2019-01-112-13/+3
* | | Merge branch 'master' into wip/runtime2Miikka Heikkinen2018-12-0420-1210/+2392
|\| |
| * | Merge branch '2.2'Miikka Heikkinen2018-12-0310-152/+406
| |\|
| | * Import data inputs when importing a presentationMiikka Heikkinen2018-12-034-31/+84
| | * Check for datainput name uniqueness only at accept when adding new DIJanne Kangas2018-12-032-2/+12
| | * Fix issues with material renamingJere Tuliniemi2018-11-301-0/+1
| | * Import also unlinked assetsMiikka Heikkinen2018-11-291-88/+101
| | * Fix referenced assets importing when importing a presentationMiikka Heikkinen2018-11-291-27/+36
| | * Hide broken 'save as' and 'save copy' functionalityMiikka Heikkinen2018-11-291-3/+1
| | * Fix presentation id crash and save for matdefsJere Tuliniemi2018-11-271-0/+3
| | * Make datainput select and management dialogs clearerJanne Kangas2018-11-264-10/+42
| | * Rename matdef in other presentations tooJere Tuliniemi2018-11-264-0/+133
| | * Fix file open error dialogTomi Korpipaa2018-11-221-3/+5
| * | Do a graceful exit when starting Studio with OpenGL ESTomi Korpipaa2018-11-222-9/+15
| |/
| * Fix importing .materialdef filesMiikka Heikkinen2018-11-161-1/+1
| * Fix opening SampleProject from welcome screenTomi Korpipaa2018-11-161-2/+2
| * Fix crash if startup dialog is closed after welcome screen has been closedTomi Korpipaa2018-11-161-5/+5
| * Integrate Google breakpad with Qt 3D StudioMahmoud Badri2018-11-151-0/+16
| * Fix crash on macOSTomi Korpipaa2018-11-131-0/+2
| * Import non-default custom material assetsMiikka Heikkinen2018-11-131-45/+84
| * Fix missing asset imports when importing a presentationMiikka Heikkinen2018-11-072-4/+26
| * Populate recent items menu even when startupdialog is rejectedTomi Korpipää2018-11-051-2/+2
| * Add delete option to project view context menuMiikka Heikkinen2018-11-052-0/+70