sphrose 4e5b62ee25 conflict fix ...

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

2021-12-03 11:36:58 +00:00

..

Code

Fully spelling out 'Autonomous' and 'Authority' in the test autocomponent based on review feedback

2021-11-22 08:34:44 -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

conflict fix

2021-12-03 11:36:58 +00: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