4f746fddac
chore: Rename Graph to EditorGraph
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-24 16:59:23 -08:00
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
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
2021-12-20 14:42:47 -06:00
ae8f724124
Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset
...
redcoding asset handler, holder, tracker, memory asset
2021-12-16 16:29:58 -08:00
671479c095
remove dev comment
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-14 19:05:43 -08:00
2271fa3dc6
redcode sc asset files bloodbath
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-14 15:09:46 -08:00
e078eac379
redcode the asset itself WIP
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-14 14:17:06 -08:00
c5d370723e
redcoding asset handler, holder, tracker, memory asset
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 14:14:31 -08:00
dc538d94e5
update error window message and add AP launch request
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:45 -08:00
d284d908b9
Make version explorer wait on AP for dependent assets
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:33 -08:00
3e728d1183
fixed another string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:27 -08:00
b10c679c33
fixed string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:25 -08:00
4f00718a38
fix linux build error, change translation system errors to warnings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:23 -08:00
713cd4337c
Merge pull request #6263 from aws-lumberyard-dev/scripting/enable_minimap
...
Enabled the Script Canvas Minimap. It will be tested and any performa…
2021-12-13 07:49:45 -08:00
87023cae47
finish last of pre-PR clean up, including saving over previsouly opened tabs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:46 -08:00
6421463df2
clean up WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:46 -08:00
c4ea3075cc
fixed unit tests bugs, removed commented out code, removed loading spam
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:43 -08:00
23267fd862
SC Editor serialization update in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:41 -08:00
d9f849b03e
File state change include external delete detection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:40 -08:00
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 >
2021-12-10 11:56:31 -08:00
f8fdf4b306
fixed version explorer issue
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:32 -08:00
015185f9d6
fix upgrade scanner
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:31 -08:00
b7d8c1a644
make default names NOT the default name of a previously existing file
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:30 -08:00
921f675df2
restore source file deleted behavior
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:29 -08:00
d8e8cdba60
multi tab close fixed
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:28 -08:00
5558be2aeb
new source file close button works, but not on multiple tabs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:27 -08:00
6c1d1dc2e2
new source file button works
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:27 -08:00
65814e65cc
source file save-as
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:26 -08:00
5cd8eb648c
source save in place first pass
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:25 -08:00
1ea245e46c
source save asset-free WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:24 -08:00
d40b9fc809
add file state for graphs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:24 -08:00
20147ddafb
it renders!
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:23 -08:00
cbbd6df0c5
clean up open pipeline to render graph
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:22 -08:00
bc342df6b4
initial compile of detailed path of change to regular sc files
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:18 -08:00
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 >
2021-12-10 11:52:37 -08:00
31c627defc
initial scriptcanvas source handle
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:52:36 -08:00
64d21c9448
Make version explorer wait on AP for dependent assets
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-08 16:11:38 -08:00
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 >
2021-12-08 13:59:57 -08:00
c218fd9b77
fixed another string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 20:17:36 -08:00
f7547a4cbd
fixed string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 19:55:27 -08:00
db798bdbc7
fix linux build error, change translation system errors to warnings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 18:18:06 -08:00
6bd0308339
Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 14:17:35 -08:00
5a0ab6814d
finish last of pre-PR clean up, including saving over previsouly opened tabs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-02 09:17:05 -08:00
5da820a8c2
clean up WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-02 00:25:50 -08:00
132d06b6da
fixed unit tests bugs, removed commented out code, removed loading spam
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-24 18:55:11 -08:00
205b2c27ee
SC Editor serialization update in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-22 16:04:49 -08:00
04fe1d5243
File state change include external delete detection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-22 11:03:37 -08:00
f1632b099c
editor sc component switched over to source handle, not yet connected to file notifications
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-19 10:03:16 -08:00
0367a3297f
fixed version explorer issue
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-17 12:17:45 -08:00
21c3aba7da
Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-17 11:13:38 -06:00
Michael Pollind
Mike Balfour
carlitosan
Luis Sempé
Chris Galvan