11 Commits

Author	SHA1	Message	Date
Chris Galvan	3b1873b045	Merged stabilization/2106 -> development (resolved merge conflicts). ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-08 13:56:47 -05:00
alexmontAmazon	dae2ddaec2	fix for [LYN-4828], message box style changes (#1911) ... * fix for [LYN-4828], message box style changes Signed-off-by: Alex Montgomery <alexmont@amazon.com> * now with missing .qss file! Friends don't let friends git add -u Signed-off-by: Alex Montgomery <alexmont@amazon.com>	2021-07-07 13:49:55 -07:00
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 12:42:44 -05:00
Steve Pham	b4a2edec6a	Final update copyright headers to reference license files at the repo root (#1693) ... * Final update copyright headers to reference license files at the repo root Signed-off-by: spham <spham@amazon.com> * Fix copyright validator unit tests to support the stale O3DE header scenario Signed-off-by: spham <spham@amazon.com>	2021-06-30 19:51:55 -07:00
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	2021-06-28 19:09:20 -07:00
John Jones-Steele	5279f05403	Entity Outliner - Sort Order options don't show current selection ... Also fixes the menus that have checkmark and icon	2021-06-24 11:59:44 +01:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
John Jones-Steele	5e4f021d55	Cherry picked from development	2021-06-21 15:28:41 +01:00
John Jones-Steele	0983d1ba45	Changes made to address comments.	2021-06-16 11:22:59 +01:00
John Jones-Steele	ed47bb07ab	Menu icon behaviour fixed.	2021-06-11 14:52:01 +01:00
alexpete	a10351f38d	Initial commit	2021-03-08 14:30:57 -08:00