Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts ...

Signed-off-by: Gene Walters <genewalt@amazon.com>

2021-10-28 09:56:01 -07:00

..

Code

Merging latest dev

2021-10-19 16:21:38 -07:00

Editor/Scripts

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

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

PythonCoverage

Fix for PyTest editor test case names.

2021-10-19 13:23:23 +01:00

PythonTests

Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts

2021-10-28 09:56:01 -07:00

Resources

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

2021-08-16 15:13:35 -07: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

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

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

gem.json

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

preview.png

Integrating latest 47acbe8

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