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

..

.src

Adding reflection ang GI probe test data

2021-06-18 11:09:46 -05:00

Assets

Adding reflection ang GI probe test data

2021-06-18 11:09:46 -05:00

Registry

Update to modernize the Sponza asset gem to best practices and consistency

2021-06-17 10:33:22 -05:00

Tools

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

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

.gitignore

Update to modernize the Sponza asset gem to best practices and consistency

2021-06-17 10:33:22 -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

gem.json

Updated gem.json for all top-level Gems. (#1715)

2021-07-02 15:23:10 -05:00

preview.png

Integrating latest 47acbe8

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

Project_Env.bat

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

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

User_env.bat.template

Update to modernize the Sponza asset gem to best practices and consistency

2021-06-17 10:33:22 -05:00

workspace.mel

Integrating latest 47acbe8

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