Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. ...

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

2021-08-11 15:33:50 -05:00

..

Code

Add LyShine gem runtime dependency to Material Editor in AutomatedTesting project (#2996)

2021-08-10 14:41:24 -05:00

Editor/Scripts

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

PythonCoverage

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

PythonTests

Resolved conflicts in merge from stabilization/2106 -> development.

2021-08-11 15:33:50 -05:00

Resources

[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.

2021-07-07 11:29:18 -05:00

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

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

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

gem.json

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

2021-07-07 13:29:33 -05:00

preview.png

Integrating latest 47acbe8

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