santorac b5c7869f14 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3 ...

There were lots of material system conflicts that had to be resolved. I expect the build is broken at this commit, and I'll fix it in followup commits.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>

2022-01-25 14:47:24 -08:00

..

Assets

Move, convert, and rename Lucy level to Hermanubis in AutomatedTesting (#6627)

2022-01-05 11:03:28 -06:00

Code

Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3

2022-01-25 14:47:24 -08:00

AssetProcessorGemConfig.setreg

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

CMakeLists.txt

Templates restricted (#6498)

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

gem.json

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

workspace.mel

Integrating latest 47acbe8

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