Commit Graph

96 Commits (eb84f541389590ccac056401204609308ed12090)

Author SHA1 Message Date
lsemp3d 1a8fdd9c84 Script Canvas: Added take screenshot button to toolbar
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Luis Sempé 891a13631e
Merge branch 'development' into chore/rename-Graph-EditorGraph-Match 4 years ago
carlitosan 295c836ed8 clean up comments, add set type action in disabled form
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 1431afb51a remove a ability to change type on user added slots
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan da0a10bb4c
fix for edit SC action in entity context menu (#6686)
* on demand reflect az events when they are the return value of ebuses

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix crash and functionality for edit sc editor context menu action

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 6c986657b4
Fix for file-save-as-new and open asset (#6490)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Michael Pollind 4f746fddac chore: Rename Graph to EditorGraph
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
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
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
carlitosan ae8f724124
Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset
redcoding asset handler, holder, tracker, memory asset
4 years ago
carlitosan 671479c095 remove dev comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 2271fa3dc6 redcode sc asset files bloodbath
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan e078eac379 redcode the asset itself WIP
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan dc538d94e5 update error window message and add AP launch request
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan d284d908b9 Make version explorer wait on AP for dependent assets
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 3e728d1183 fixed another string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan b10c679c33 fixed string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 4f00718a38 fix linux build error, change translation system errors to warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Luis Sempé 713cd4337c
Merge pull request #6263 from aws-lumberyard-dev/scripting/enable_minimap
Enabled the Script Canvas Minimap. It will be tested and any performa…
4 years ago
chcurran 87023cae47 finish last of pre-PR clean up, including saving over previsouly opened tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 6421463df2 clean up WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran c4ea3075cc fixed unit tests bugs, removed commented out code, removed loading spam
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 23267fd862 SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran d9f849b03e File state change include external delete detection
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran ad8cfa5f99 editor sc component switched over to source handle, not yet connected to file notifications
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran f8fdf4b306 fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 015185f9d6 fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran b7d8c1a644 make default names NOT the default name of a previously existing file
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 921f675df2 restore source file deleted behavior
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran d8e8cdba60 multi tab close fixed
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 5558be2aeb new source file close button works, but not on multiple tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 6c1d1dc2e2 new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 65814e65cc source file save-as
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 5cd8eb648c source save in place first pass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 1ea245e46c source save asset-free WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran d40b9fc809 add file state for graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 20147ddafb it renders!
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran cbbd6df0c5 clean up open pipeline to render graph
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran bc342df6b4 initial compile of detailed path of change to regular sc files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran c5cd854172 Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 31c627defc initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 64d21c9448 Make version explorer wait on AP for dependent assets
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d a6b2e2cabd Enabled the Script Canvas Minimap. It will be tested and any performance concerns will be addressed
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
carlitosan c218fd9b77 fixed another string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan f7547a4cbd fixed string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan db798bdbc7 fix linux build error, change translation system errors to warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 5a0ab6814d finish last of pre-PR clean up, including saving over previsouly opened tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 5da820a8c2 clean up WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago