Commit Graph

555 Commits

Author SHA1 Message Date
carlitosan 4e755cc258 Add variable, datum sanity for user added slots
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2022-01-12 16:21:40 -08:00
moraaar 57e4fb9b39 Fixed script canvas component asset not being found (#6727)
Script canvas component has the member m_sourceData (that points to the script canvas asset) that internally has data, id and path. Path is serialized as the absolute path of the pc that is saving the level.

So when another pc loads the same level it cannot find the script canvas asset.

The function CompleteDescription takes a look at the id and takes the path from the asset catalog, but at the moment it's doing an early return because id and path are not empty (but path is the value serialized from other user saving the level).

By removing the early return condition then it it will resolve by using id, looking into the catalog and getting the real path.

This fix makes several physics automated tests that relied on script canvas to work.

Signed-off-by: moraaar moraaar@amazon.com
2022-01-10 09:05:35 +00:00
carlitosan 7f4fe67f77 Fix issues caused by SC editor component holding onto a live graph (#6734)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2022-01-06 16:35:36 -08:00
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>
2022-01-05 19:04:55 -08:00
carlitosan c83bf11a3d on demand reflect az events when they are the return value of ebuses (#6625)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2022-01-04 14:21:06 -08:00
carlitosan 6c986657b4 Fix for file-save-as-new and open asset (#6490)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2022-01-03 13:18:18 -08:00
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>
2021-12-20 15:24:47 -06:00
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 c6eead4efa remove uber build exceptions (#6466)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-17 15:23:14 -08:00
carlitosan 9c7a558ccb basic refactor of assets (#6467)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-17 12:36:05 -08: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 73e0bdbe6e fix version deletion error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-15 21:49:01 -08:00
carlitosan 1fdee48b6d fix Linux build error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-15 11:08:23 -08:00
carlitosan 024c53ece3 untested fix for object stream version bug
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-15 10:24:32 -08:00
carlitosan e1c1adf2dc fix linux build error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-14 23:20:12 -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 f2bbf41881 fix color background in editor
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-14 18:01:22 -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
Luis Sempé 3ee7cef09e Merge pull request #6306 from aws-lumberyard-dev/scripting/fix_slot_names
Fixed incorrect condition that led to badly named slots
2021-12-14 11:27:15 -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 0a1dc3c4bd Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:54 -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 a5b30ffc5a fix interpreted statics
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:50 -08:00
carlitosan 9830925309 small fixes for SC play in editor and warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:49 -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 0f07de7454 fix verbose setting
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:39 -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 d8e5315199 Use weak reference for undo state, as it is an entirely internal class
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:31 -08:00
carlitosan b9bbe233be Restore undo/redo
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:29 -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
carlitosan 07bf8fc755 fix linux build error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:21 -08:00
chcurran 0cc4c06213 remove uneeded files/comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-13 10:28:19 -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 2c107c364f fix mismatched file name on modification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:45 -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