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 2c8a93fb9c Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE ... Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> # Conflicts: # Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp # Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h # Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp # Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl # Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h # Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp # Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp # Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp # Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h # Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp # Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake		4 years ago
..
BuilderSystemComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ScriptCanvasBuilder.cpp	redcode sc asset files bloodbath	4 years ago
ScriptCanvasBuilder.h	redcode sc asset files bloodbath	4 years ago
ScriptCanvasBuilderComponent.cpp	redcode sc asset files bloodbath	4 years ago
ScriptCanvasBuilderComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ScriptCanvasBuilderWorker.cpp	Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE	4 years ago
ScriptCanvasBuilderWorker.h	basic refactor of assets (#6467)	4 years ago
ScriptCanvasBuilderWorkerUtility.cpp	basic refactor of assets (#6467)	4 years ago