Chris Burel d942c90c56 Merge branch stabilization/2110 into development ...

Signed-off-by: Chris Burel <burelc@amazon.com>

2021-11-04 13:44:22 -07:00

..

Assets

Since I was already working with _dev_shaderball_00_basecolor.png from AtomLyIntegration gem, I went ahead and updated the one in MaterialEditor to match, because I noticed that the one from AtomLyIntegration was a bit nicer, having colored arrays instead of low contrast gray ones.

2021-09-23 12:42:10 -07:00

Code

updated comments

2021-11-03 17:30:20 -05:00

Scripts

Update the FileIO Aliases (#4186)

2021-10-05 15:12:53 -05:00

CMakeLists.txt

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

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

gem.json

License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)

2021-11-04 13:04:06 -07:00

preview.svg

ATOM-15128 replacing material editor icon

2021-05-10 18:02:26 -05:00

workspace.mel

Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00