Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif

2021-12-07 13:31:55 -08:00

..

Platform

add shaderoptiongroup natvis (#3315)

2021-08-19 17:09:01 -05:00

RPI.Builders

Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de

2021-11-18 09:42:47 -08:00

RPI.Edit

Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de

2021-11-19 15:46:16 -08:00

RPI.Editor

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

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

RPI.Private

Revert "Refresh rate driven rendering tick logic (#3375)"

2021-09-21 16:47:24 -07:00

RPI.Public

Merge branch 'development' into redcode/driller_removal

2021-12-07 13:31:55 -08:00

RPI.Reflect

Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed

2021-12-02 17:12:25 -08:00