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

..

AtomBridge

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

AtomFont

Fix for LYN-4594: [Atom][EMFX] Loading a saved level with entity and an actor component causes the editor to freeze. (DCO fixup) (#1878)

2021-07-07 15:09:14 -07:00

AtomImGuiTools

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

AtomViewportDisplayIcons

Fix for LYN-4594: [Atom][EMFX] Loading a saved level with entity and an actor component causes the editor to freeze. (DCO fixup) (#1878)

2021-07-07 15:09:14 -07:00

AtomViewportDisplayInfo

Use DPI scaling for viewport info padding

2021-07-07 11:51:20 -07:00

CommonFeatures

Merged stabilization/2106 -> development (resolved merge conflicts).

2021-07-08 13:56:47 -05:00

EMotionFXAtom

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

ImguiAtom

Fixed warning of variable not being used in release of ImguiAtom.

2021-07-08 12:37:43 +01:00

TechnicalArt

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

CMakeLists.txt

Added detection of gems which are not directly under an external subdirectory root (#1841)

2021-07-02 21:46:26 -05:00

gem.json

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00