You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Chris Galvan 94644cad1e Merged development, fixed merge conflict ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		4 years ago
..
Assets	Fix for github issue https://github.com/o3de/o3de/issues/6380 (#7386)	4 years ago
Code	Merged development, fixed merge conflict	4 years ago
External/CubeMapGen	Fix clang 13 compilation problems (#5791)	4 years ago
Registry	Moved gems .setreg files to Registry folder, otherwise they will be missing in a Pre-built SDK Engine (#7140)	4 years ago
CMakeLists.txt	Templates restricted (#6498)	4 years ago
gem.json	fix launcher not showing gems (#7015)	4 years ago
preview.png	Display Gem Icons in Gem Catalog (#7294)	4 years ago