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

the bloodbath compiles

2021-12-14 17:32:22 -08:00

Components

basic refactor of assets (#6467)

2021-12-17 12:36:05 -08:00

Debugger

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

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

Framework

basic refactor of assets (#6467)

2021-12-17 12:36:05 -08:00

GraphCanvas

Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset

2021-12-16 16:29:58 -08:00

Include/ScriptCanvas

fix version deletion error

2021-12-15 21:49:01 -08:00

Model

[Experimental] Asset Picker Flatten View (#3589)

2021-09-01 09:39:44 +01:00

Nodes

basic refactor of assets (#6467)

2021-12-17 12:36:05 -08:00

Static

Gems/ScriptCanvas*

2021-09-10 20:24:15 -07:00

Tests

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Translation

Script Canvas node translation system and naming consistency

2021-12-07 15:40:04 -08:00

Undo

redcoding asset handler, holder, tracker, memory asset

2021-12-13 14:14:31 -08:00

Utilities

initial compile of detailed path of change to regular sc files

2021-12-10 11:54:18 -08:00

View

Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE

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

QtMetaTypes.h

Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets

2021-12-10 11:52:37 -08:00

ReflectComponent.cpp

the bloodbath compiles

2021-12-14 17:32:22 -08:00

ReflectComponent.h

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

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

ScriptCanvasEditorGem.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Settings.cpp

redcode the asset itself WIP

2021-12-14 14:17:06 -08:00

Settings.h

initial compile of detailed path of change to regular sc files

2021-12-10 11:54:18 -08:00

SystemComponent.cpp

the bloodbath compiles

2021-12-14 17:32:22 -08:00

SystemComponent.h

the bloodbath compiles

2021-12-14 17:32:22 -08:00