Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-12 10:45:23 -05:00

..

Config/Platform

Increase the platform limit to handle more objects.

2021-06-10 16:48:48 -07:00

LightingPresets

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

LookupTables

Initial commit

2021-03-08 14:30:57 -08:00

Materials

Fixing alpha affects specular showing up when the alpha mode is opaque or cut-out. It should only be available when mode is blended or tinted transparent. (#1830)

2021-07-02 15:49:43 -05:00

Models

Merge pull request #1110 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15517

2021-06-04 15:21:39 -07:00

Passes

merge stabilization/2106 into development

2021-07-06 17:34:04 +01:00

Scripts

Preparation for automated benchmarks (#1923)

2021-07-09 11:28:18 -07:00

ShaderLib/Atom/Features

Merged stabilization/2106 to development; Resolved merge conflicts

2021-07-12 10:45:23 -05:00

ShaderResourceGroups

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Shaders

Merged stabilization/2106 to development; Resolved merge conflicts

2021-07-12 10:45:23 -05:00

Textures

removing folder with image data we don't own, can't license.

2021-05-28 09:49:44 -05:00

atom_feature_common_asset_files.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

generate_asset_cmake.bat

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00