Guthrie Adams 4c9f456ea5 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides ...

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

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp

2021-09-29 13:31:23 -05:00

..

3rdParty/ACES

Overhaul of LookModification (#3282)

2021-08-18 16:59:34 -05:00

Include/Atom/Feature

Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides

2021-09-29 13:31:23 -05:00

Mocks

fixed mesh feature processor abstract interface

2021-08-19 23:41:30 -07:00

Source

Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides

2021-09-29 13:31:23 -05:00

Tests

Atom

2021-07-27 19:29:20 -07:00

atom_feature_common_builders_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atom_feature_common_editor_files.cmake

Terrain feature processor improvements regarding material, mesh, and lod (#4303)

2021-09-28 15:31:59 -05:00

atom_feature_common_files.cmake

Terrain feature processor improvements regarding material, mesh, and lod (#4303)

2021-09-28 15:31:59 -05:00

atom_feature_common_public_files.cmake

Editor HDR Color Grading Component implemented under the PostFx stack (#4159)

2021-09-21 16:19:30 -05:00

atom_feature_common_shared_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atom_feature_common_staticlibrary_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atom_feature_common_tests_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CMakeLists.txt

[Mac] Generate O3DE SDK app bundle that can be notarized and distributed (#4150)

2021-09-20 11:13:47 -05:00