Chris Galvan f47e71da36 Merged conflicts from pulling down latest development ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-02 16:29:27 -05:00

..

Code

Merged conflicts from pulling down latest development

2021-07-02 16:29:27 -05:00

Config

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00

Platform

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Registry

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00

Resources

Update icons and launcher images to the O3DE logo

2021-07-01 17:38:33 -07:00

ShaderLib

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Shaders

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

.gitignore

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00

autoexec.cfg

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00

CMakeLists.txt

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

EngineFinder.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

game.cfg

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00

preview.png

Replace project template previews with default project preview (#1622)

2021-06-28 19:58:20 -07:00

project.json

Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)

2021-06-15 20:44:23 -05:00