You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		4 years ago
..
Assets	the bloodbath compiles	4 years ago
Components	basic refactor of assets (#6467)	4 years ago
Debugger	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
Framework	basic refactor of assets (#6467)	4 years ago
GraphCanvas	Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset	4 years ago
Include/ScriptCanvas	fix version deletion error	4 years ago
Model	[Experimental] Asset Picker Flatten View (#3589)	4 years ago
Nodes	basic refactor of assets (#6467)	4 years ago
Static	Gems/ScriptCanvas*	4 years ago
Tests	Merge branch 'development' into cmake/SPEC-7179	5 years ago
Translation	Script Canvas node translation system and naming consistency	4 years ago
Undo	redcoding asset handler, holder, tracker, memory asset	4 years ago
Utilities	initial compile of detailed path of change to regular sc files	4 years ago
View	Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE	4 years ago
QtMetaTypes.h	Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets	4 years ago
ReflectComponent.cpp	the bloodbath compiles	4 years ago
ReflectComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
ScriptCanvasEditorGem.cpp	Merge branch 'development' into cmake/SPEC-7179	5 years ago
Settings.cpp	redcode the asset itself WIP	4 years ago
Settings.h	initial compile of detailed path of change to regular sc files	4 years ago
SystemComponent.cpp	the bloodbath compiles	4 years ago
SystemComponent.h	the bloodbath compiles	4 years ago