AMZN-mnaumov c0dc0cb936 Merge pull request #1337 from aws-lumberyard-dev/mnaumov/StabilizationJun15 ...

Stabilization to Development merge - 06/15/21

2021-06-15 15:42:04 -07:00

..

AtomBridge

Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15

2021-06-15 10:41:13 -07:00

AtomFont

SPEC-7178 Removal of precompiled cpp files (#1171)

2021-06-07 15:59:58 -07:00

AtomImGuiTools

Adding back gem.json files to the Atom and AtomLyIntegration folders

2021-05-24 13:02:23 -05:00

AtomViewportDisplayIcons

Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-28 00:16:26 -07:00

AtomViewportDisplayInfo

Fix several viewport issues (#1045)

2021-06-01 12:20:15 -07:00

CommonFeatures

Merge pull request #1337 from aws-lumberyard-dev/mnaumov/StabilizationJun15

2021-06-15 15:42:04 -07:00

EMotionFXAtom

Merge pull request #1337 from aws-lumberyard-dev/mnaumov/StabilizationJun15

2021-06-15 15:42:04 -07:00

ImguiAtom

Adding back gem.json files to the Atom and AtomLyIntegration folders

2021-05-24 13:02:23 -05:00

TechnicalArt

Changes related to ATOM-15021, this allows maya on py2.7 to work with .o3de\boostrap changes

2021-06-09 14:27:59 -05:00

CMakeLists.txt

Restore Editor viewport icon rendering (#879)

2021-05-26 16:36:54 -07:00

gem.json

Adding back gem.json files to the Atom and AtomLyIntegration folders

2021-05-24 13:02:23 -05:00