Commit Graph

9 Commits (e9dd032a751ac0acfd512797fcbb7934a4b8c8d7)

Author SHA1 Message Date
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
sphrose ef3e31c740 Merge pull request #1454 from aws-lumberyard-dev/LYN-3619
New level dialog has no way to select a different folder
5 years ago
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 5 years ago
jjjoness 1ec238685d
Merge branch 'stabilization/2106' into LYN-2509b 5 years ago
John Jones-Steele 2dce6954a1 Cherry picked from development 5 years ago
sphrose a3b7cbeffc New level dialog has no way to select a different folder 5 years ago
jjjoness fc33a0496d
LYN-2509 Welcome page for active project when opening O3DE (#1187)
* First changes to ui

* Pre merge from main checkin

* Commit before merge from main

* Pre-merge from maon checkin.

* Commit before merge from main

* Commit before merge from main

* Pre merge from main.

* Old and new levels handled.

* New WelcomeScreenDialog.

* Fixed qss file errors.

* Removed unused file from cmake.

* Commit before change to development branch

* Final changes to WelcomeScreenDialog
5 years ago
alexpete a10351f38d Initial commit 5 years ago