9 Commits

Author	SHA1	Message	Date
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	2021-06-28 19:09:20 -07:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
sphrose	ef3e31c740	Merge pull request #1454 from aws-lumberyard-dev/LYN-3619 ... New level dialog has no way to select a different folder	2021-06-23 14:10:28 +01:00
John Jones-Steele	66c4541e14	Fixed merge error in NewLevelDialog	2021-06-22 11:25:53 +01:00
jjjoness	1ec238685d	Merge branch 'stabilization/2106' into LYN-2509b	2021-06-22 10:07:28 +01:00
John Jones-Steele	2dce6954a1	Cherry picked from development	2021-06-22 09:41:48 +01:00
sphrose	a3b7cbeffc	New level dialog has no way to select a different folder	2021-06-21 10:02:10 +01:00
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	2021-06-09 15:34:00 +01:00
alexpete	a10351f38d	Initial commit	2021-03-08 14:30:57 -08:00