summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Workspace
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.3' into wip/runtime2Miikka Heikkinen2019-03-012-10/+47
|\
| * TimeEditDlg, DurationEditDlg fixesMahmoud Badri2019-02-262-4/+4
| * implement variants import and export featuresMahmoud Badri2019-02-182-0/+38
| * Fix 'set keyframe time' dialog issueMahmoud Badri2019-01-302-3/+3
| * Fix missing initial color from Color DialogTomi Korpipaa2019-01-231-1/+1
| * Timeline clean upsMahmoud Badri2019-01-172-5/+4
* | Merge branch 'master' into wip/runtime2Miikka Heikkinen2019-01-172-29/+50
|\|
| * Implement 'save project as' and 'duplicate presentation'Miikka Heikkinen2019-01-102-23/+44
| * Improve inspector mesh chooserMahmoud Badri2018-12-121-5/+5
* | Cleanup unused codesMäättä Antti2019-01-111-1/+0
* | Merge branch 'master' into wip/runtime2Miikka Heikkinen2018-12-042-14/+90
|\|
| * Allow .shader suffix for .material filesJere Tuliniemi2018-11-301-2/+2
| * Fix file open error dialogTomi Korpipaa2018-11-222-2/+4
| * Fix importing .materialdef filesMiikka Heikkinen2018-11-162-0/+13
| * Prevent "MaterialContainer" as a user-entered nameJere Tuliniemi2018-11-082-0/+16
| * Fix missing asset imports when importing a presentationMiikka Heikkinen2018-11-072-0/+6
| * Support importing materialdefsJere Tuliniemi2018-11-021-2/+2
| * Change .matdata extension to .materialdefJere Tuliniemi2018-10-301-1/+1
| * Make time and duration edit dialog showing asynchronousMiikka Heikkinen2018-10-192-0/+27
| * Ensure browser popups always end up with desired sizeMiikka Heikkinen2018-10-191-1/+6
| * Fix datainput chooser popup alignmentMiikka Heikkinen2018-10-192-8/+23
| * Remove native separators usageMiikka Heikkinen2018-10-161-1/+1
* | Convert Qt3DSFile to QStringMäättä Antti2018-11-271-1/+1
* | Replace paths and strings with QString and QFileInfoMäättä Antti2018-11-232-287/+109
|/
* Change many CStrings to QStringMahmoud Badri2018-10-102-41/+34
* Remove hierarchies from Referenced material dialogMahmoud Badri2018-09-262-9/+15
* Merge branch '2.1' into masterMiikka Heikkinen2018-09-251-2/+2
|\
| * Add support for importing *.ktx texturesTomi Korpipaa2018-09-171-2/+2
* | Merge branch 'master' into wip/refmaterialMiikka Heikkinen2018-08-302-11/+15
|\|
| * Fix rendering subpresentations in the viewerMahmoud Badri2018-08-232-3/+3
| * Fix invalid filter bug in import file dialogTomi Korpipaa2018-08-221-8/+12
* | Add a new material file formatJere Tuliniemi2018-08-272-1/+6
|/
* Prevent saving a new presentation outside current projectMiikka Heikkinen2018-08-212-4/+26
* Set qml streams from timeline context menuMahmoud Badri2018-08-171-2/+1
* Import Qml streamsMahmoud Badri2018-08-171-0/+10
* Switch to native file dialogs in Studio EditorTomi Korpipaa2018-08-161-6/+4
* Improve dialog text for missing datainputsJanne Kangas2018-08-161-6/+8
* Make creating new project default to parent of recently opened projectMiikka Heikkinen2018-08-152-34/+27
* Fix macOS ColorDialog crashTomi Korpipaa2018-08-092-1/+18
* Prohibit setting duplicate or empty object name in inspectorMiikka Heikkinen2018-08-092-0/+16
* Add presentation id to the presentation settings panelMahmoud Badri2018-07-264-2/+57
* Initial work in the project/presentations handling tasksMahmoud Badri2018-07-042-14/+61
* Do not create undo point if user auto-deletes datainput bindingsJanne Kangas2018-06-271-3/+11
* Consolidate stdafx headers into Qt3DSCommonPrecompile.hMiikka Heikkinen2018-06-121-1/+1
* Update datainput usage during editingJanne Kangas2018-05-302-6/+10
* Check missing datainput definitions when opening a presentationJanne Kangas2018-05-232-1/+71
* Open "Import Assets" to the main asset folderTomi Korpipaa2018-05-231-3/+12
* Re-organize folder structure to remove obsolete _Win folderTomi Korpipaa2018-05-092-0/+1324
* Fix issues with popup positioningMiikka Heikkinen2018-05-071-1/+1
* Remove LUATomi Korpipaa2018-04-191-2/+0