guthadam b37145589d Merge branch 'main' into Atom/guthadam/LYN-3871_LYN-3872_material_assignment_json_serializer_for_prefabs

2021-06-01 19:38:57 -05:00

..

AtomBridge

Fix several viewport issues (#1045)

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

AtomFont

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

2021-05-27 10:39:37 -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

LYN-3871/3872 Added JSON serializer for MaterialAssignment property overrides

2021-06-01 11:43:05 -05:00

EMotionFXAtom

Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948

2021-05-26 09:06:49 -07:00

ImguiAtom

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

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

TechnicalArt

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

2021-05-27 10:39:37 -07: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