 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
|
2021-12-20 14:42:47 -06:00 |
|
 carlitosan
|
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 |
|
|
carlitosan
|
671479c095
|
remove dev comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-14 19:05:43 -08:00 |
|
|
carlitosan
|
686f82666b
|
disable test manager until the asset browsing is fixed
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-14 18:52:50 -08:00 |
|
|
carlitosan
|
81bb7aab80
|
the bloodbath compiles
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-14 17:32:22 -08:00 |
|
|
carlitosan
|
2271fa3dc6
|
redcode sc asset files bloodbath
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-14 15:09:46 -08:00 |
|
|
carlitosan
|
e078eac379
|
redcode the asset itself WIP
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-14 14:17:06 -08:00 |
|
|
carlitosan
|
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 |
|
|
carlitosan
|
837e532ad7
|
fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:52 -08:00 |
|
|
carlitosan
|
0963bc0cc5
|
removed commented out include
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:47 -08:00 |
|
|
carlitosan
|
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 |
|
|
carlitosan
|
cbc70b4b88
|
Add dialog window for messaging when SC assets fail to save
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:43 -08:00 |
|
|
carlitosan
|
aeabf21bba
|
clean up debug output settings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:41 -08:00 |
|
|
carlitosan
|
ac6c90cd2c
|
pre-PR cleanup
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:37 -08:00 |
|
|
carlitosan
|
169416c2f9
|
remove testing code
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:35 -08:00 |
|
|
carlitosan
|
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 |
|
|
carlitosan
|
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 |
|
|
carlitosan
|
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 |
|
|
carlitosan
|
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 |
|
|
chcurran
|
d31c6a2774
|
remove uneeded files/comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-13 10:28:17 -08:00 |
|
 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…
|
2021-12-13 07:49:45 -08:00 |
|
|
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>
|
2021-12-10 11:56:46 -08:00 |
|
|
chcurran
|
6421463df2
|
clean up WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:56:46 -08:00 |
|
|
chcurran
|
d8add36212
|
restore file save
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:56:45 -08:00 |
|
|
chcurran
|
499cdaae5e
|
version upgrader in a presumed working story
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:56:44 -08:00 |
|
|
chcurran
|
55fa33cff4
|
Clean up modifier asset handling. Fix file handling string error.
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:56:44 -08:00 |
|
|
chcurran
|
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 |
|
|
chcurran
|
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 |
|
|
chcurran
|
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 |
|
|
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>
|
2021-12-10 11:56:31 -08:00 |
|
|
chcurran
|
727d1b3815
|
more aggressively release graph memory in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:56:30 -08:00 |
|
|
chcurran
|
f8fdf4b306
|
fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:32 -08:00 |
|
|
chcurran
|
4484b69036
|
isolate the loading problem during version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:31 -08:00 |
|
|
chcurran
|
015185f9d6
|
fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:31 -08:00 |
|
|
chcurran
|
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 |
|
|
chcurran
|
921f675df2
|
restore source file deleted behavior
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:29 -08:00 |
|
|
chcurran
|
d8e8cdba60
|
multi tab close fixed
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:28 -08:00 |
|
|
chcurran
|
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 |
|
|
chcurran
|
6c1d1dc2e2
|
new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:27 -08:00 |
|
|
chcurran
|
65814e65cc
|
source file save-as
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:26 -08:00 |
|
|
chcurran
|
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 |
|
|
chcurran
|
1ea245e46c
|
source save asset-free WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:24 -08:00 |
|
|
chcurran
|
d40b9fc809
|
add file state for graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:24 -08:00 |
|
|
chcurran
|
20147ddafb
|
it renders!
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:54:23 -08:00 |
|
|
chcurran
|
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 |
|
|
chcurran
|
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 |
|
|
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>
|
2021-12-10 11:52:37 -08:00 |
|
|
chcurran
|
31c627defc
|
initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
2021-12-10 11:52:36 -08:00 |
|
|
carlitosan
|
72d00dd94c
|
fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
2021-12-09 11:43:36 -08:00 |
|
|
carlitosan
|
48ca34eb9f
|
Merge pull request #6267 from aws-lumberyard-dev/sc-editor-asset-redux
Make version explorer wait on AP for dependent assets
|
2021-12-09 09:49:58 -08:00 |
|