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

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Editor/Scripts

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

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

PythonCoverage

Merged conflicts from pulling down latest development

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

PythonTests

Fixed copyright header issues per new validator

2021-07-02 15:34:04 -05:00

Resources

[iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. (#1625)

2021-06-28 17:53:43 -07:00

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

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

CMakeLists.txt

Resolved merge conflicts

2021-07-02 12:42:44 -05: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