Neil Widmaier d038c4e843 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_o3de_local

2022-01-24 13:56:34 -08:00

..

Code

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

Editor/Scripts

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

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

PythonCoverage

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

PythonTests

Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_o3de_local

2022-01-24 13:56:34 -08:00

Resources

Remove non-existant files from icon contents.json files (#3148)

2021-08-16 15:13:35 -07:00

Sponza

Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.

2022-01-18 19:02:36 -08:00

AssetProcessorGemConfig.setreg

Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504)

2021-10-28 09:45:27 -07:00

CMakeLists.txt

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

gem.json

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

preview.png

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00