Guthrie Adams 050de68f7d Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator ...

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h

2021-10-01 16:39:57 -05:00

..

AzToolsFramework

Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator

2021-10-01 16:39:57 -05:00

Platform

Archive Component - Rewrite and additional work on Archive and Asset Bundler (#4332)

2021-10-01 10:15:16 -05:00

Tests

Fix Entity id consistency issue & refactor prefab workflows/tests (#4373)

2021-10-01 10:02:00 -07:00

CMakeLists.txt

Merge branch 'development' into cmake/SPEC-2513_w4244

2021-08-17 12:10:46 -07:00