Mike Balfour 92b0514b48 Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE ...

# Conflicts:
#	Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp

Also fixed bad merge on ScripCanvas MainWindow.cpp

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

2021-12-20 15:24:47 -06:00

..

Assets

Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload

2021-12-03 07:36:54 -08:00

Code

Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE

2021-12-20 15:24:47 -06:00

Registry

Script Canvas, replace the text replacement system to a JSON file based one (#5228)

2021-11-11 11:53:51 -08:00

.gitignore

Added .gitignore so that Script Canvas debug logs don't get picked up as untracked files.

2021-08-02 14:02:39 -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.png

Initial commit

2021-03-08 14:30:57 -08:00