Tommy Walton 8887b55fc8 Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2 ...

Signed-off-by: Tommy Walton <waltont@amazon.com>

2021-11-16 12:53:42 -08:00

..

Code

Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21

2021-11-11 10:15:52 -08:00

Editor/Scripts

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

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

PythonCoverage

License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)

2021-11-04 13:04:06 -07:00

PythonTests

Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:53:42 -08: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

License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)

2021-11-04 13:04:06 -07:00

preview.png

Integrating latest 47acbe8

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