Aristo7 b6740dd972 Merge remote-tracking branch 'upstream/main' into Atom/olexl/ATOM-15376

2021-05-11 15:19:17 -05:00

..

Code

Merged main in

2021-05-07 14:29:14 -05:00

Editor/Scripts

adding the testing files for testing for python asset building and scripting

2021-04-16 13:58:57 -05:00

PythonTests

Removing test dependency from EditorTests

2021-05-11 12:50:38 -05:00

Resources

Integrating latest 47acbe8

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

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

2021-03-26 14:32:02 -07:00

CMakeLists.txt

Integrating latest 47acbe8

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

gem.json

Integrating latest 47acbe8

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

preview.png

Integrating latest 47acbe8

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