Alex Peterson c69142b73b Merge branch upstream/stabilization/2110 ...

* Conflict GemModel.h

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

2021-11-04 17:02:00 -07:00

..

ComponentPalette

Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.

2021-10-26 15:47:17 -05:00

Docking

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

EditorEntityUi

LYN-7448 + LYN-7542 + LYN-7543 | Focus Mode - UX Improvements (#4837)

2021-10-21 13:43:21 -07:00

Layer

PerScreenDpi | QLabels incorrectly handle scale for icons (#4070)

2021-09-14 20:35:56 +01:00

LegacyFramework

Code/Framework/AzToolsFramework

2021-09-10 20:19:32 -07:00

Logging

some more fixes

2021-09-09 11:50:13 -07:00

Notifications

bugifx: resolve crash with project manager (#5151)

2021-11-03 12:26:49 -07:00

Outliner

LYN-7054 + LYN-7704 | Exit Focus Mode when starting Game Mode, correct painting of Prefab capsules in Outliner. (#5280)

2021-11-04 09:52:35 -07:00

Prefab

LYN-7054 + LYN-7704 | Exit Focus Mode when starting Game Mode, correct painting of Prefab capsules in Outliner. (#5280)

2021-11-04 09:52:35 -07:00

PropertyEditor

Fix clearing material component default material not clearing materials or updating preview

2021-10-28 13:58:47 -05:00

SearchWidget

Modernization + AZStd::function compare fix. (#3680)

2021-09-02 14:55:09 -05:00

Slice

some more fixes

2021-09-09 11:50:13 -07:00

UICore

Modernization + AZStd::function compare fix. (#3680)

2021-09-02 14:55:09 -05:00