9ad837c952
Removes SceneActionsMenuGroup.h/cpp from Gems/GraphCanvas
...
Removes Resource.h from Gems/GraphCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:07:11 -08:00
0f59718ff0
Removes CommentConstructMenuActions.cpp/h from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:07:08 -08:00
504009a63b
Removes definitions.cpp from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:07:06 -08:00
7292fea50f
Removes VariableNodeBus.h from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:07:04 -08:00
f286946377
Removes VariableDataInterface.h from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:07:02 -08:00
592a7dd9b3
Removes DoubleDataInterface from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:06:59 -08:00
886a9631c7
Removes CommentLayerControllerComponent from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:06:57 -08:00
640f4980cd
Removes VariableReferenceNodePropertyDisplay.h/cpp from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:06:55 -08:00
78ae3fdb80
Removes tools.cpp from Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2022-01-20 16:06:53 -08:00
56475f529c
Merge pull request #6911 from aws-lumberyard-dev/carlitosan-sc-bug-bash-4
...
Make SC User data slots proper, immutable variable references
2022-01-18 08:41:08 -08:00
295c836ed8
clean up comments, add set type action in disabled form
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2022-01-14 12:46:08 -08:00
b62d130475
Updated AnimNode registration in LyShine and Maestro to register to a member variable map ( #6786 )
...
* Updated the Maestro MovieSystem and LyShine AnimationSystem to register
Anim Nodes and Anim Params into a member variable map
Previously the registration was occuring in a global variable map inside
of Movie.cpp and UiAnimationSystem.cpp
Rolled back the changes to update the CUiAnimNode and CAnimParamType to
use the stateless allocator in their m_name string member.
This was only needed because those types were used in global memory.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the AZStd::hash specializations for basic_string and
basic_fixed_string to be transparent.
This allows hashing of types that aren't basic_string or
basic_fixed_string using the hash specializations for those types
without needing to create an instance of those types.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding call to disable saving of the UserSettings.xml in the DisplaySettingsPythonBindingsFixture to avoid race condition running the test in parallel
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2022-01-14 11:32:29 -06:00
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
7581967da3
Merge pull request #6300 from tjmgd/bug-script-canvas-60
...
Script Canvas Groups - Updated keyboard shortcut bindings to avoid conflict with "play game" shortcuts
2022-01-03 14:56:06 -08:00
5867e65720
The search cursor on the Node Palette interface does not cover the ( #6218 )
...
searched keywords completely
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-22 11:34:48 -08:00
454d6405b0
Merge pull request #6465 from aws-lumberyard-dev/scripting/catalog_load
...
Code maintenance, improved OnCatalogLoaded logic and track additions …
2021-12-22 09:50:57 -08: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
86d22c8bb3
Updated GraphCanvasSystemComponent::OnCatalogLoaded to use
...
TranslationRequests::Restore
The TranslationDatabase::Restore function will clear out the database
before merging in all the translation .names files making it idempotent.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-17 18:32:14 -06:00
20d55c6267
Fixed the translation error messages for GraphCanvas
...
It was unconditionally logging an AZ_Warning and AZ_Error if a
translation entry with the same key was added to the database.
This didn't account for the same key and value being added to the
database, so loading the same translation file twice would result in
error messages for each entry.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-17 18:32:05 -06:00
c7c96d8baf
Code maintenance, improved OnCatalogLoaded logic and track additions and removals
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-12-16 17:20:37 -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
20147ddafb
it renders!
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:23 -08:00
7276ad0dbf
The Groups and Ungroups shortcut keys in Script Canvas Editor do not
...
take effect
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-09 16:46:18 +00:00
72bfd8bdf8
Script Canvas node translation system and naming consistency
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-12-07 15:40:04 -08:00
15e26b7515
merge development
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-06 12:21:45 -08:00
be607521e7
Optimizations to graph canvas translation json serializer
...
A handful of places in tight loops were looking up JSON and map entries multiple times in a row
Moving and reusing string variables in tight loops
Deferring string creation, copying, assignment until needed
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-03 14:21:22 -06: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
c7c2eae980
PR feedback
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-30 10:55:01 -08:00
d1c683b8ee
If the asset catalog gets reloaded, clear the translation to avoid duplicates
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-30 10:16:30 -08:00
3922280cec
Merge pull request #6006 from aws-lumberyard-dev/scripting/text_updates_pass7
...
Updated GameLift names, improved Getter/Setter generation
2021-11-29 16:17:35 -08:00
d2595272dc
Removed unused variable
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-29 15:46:19 -08:00
637c12836d
Removed code that lead to double asset handler registration
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-29 14:14:11 -08:00
eca2e36687
Fix clang 13 compilation problems ( #5791 )
...
* Fix clang 13 compilation problems
Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* apply review suggestions
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix type in assert message
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-11-25 09:24:39 +00:00
91076dbf79
Removed temporary migration code to replace 'key' entry in names files
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-23 12:07:52 -08:00
2da3ab42fd
Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-23 08:50:41 -08:00
99a706c2a5
Merge branch 'development' into scripting/text_updates_pass5
2021-11-22 12:24:00 -08:00
5d09e8d42e
Fixed generated property names, pull argument names from BC when available, auto-reload on asset change
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-22 12:22:38 -08:00
f44a9e196c
Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de
2021-11-18 09:37:50 -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
35b4f6a538
Replaced float with AZ::u32
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 14:46:38 -08:00
cffd93642e
Reverted unnecessary change
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 11:48:35 -08:00
ca66c609aa
Added user setting to change the Script Canvas node palette context menu
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 11:43:16 -08:00
facfdf4e7a
Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-11 16:07:18 -08:00
9e2a3226fd
Script Canvas, replace the text replacement system to a JSON file based one ( #5228 )
...
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
2021-11-11 11:53:51 -08:00
0175e9d3cb
Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
2021-11-04 15:58:44 -07:00
2791384a79
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:41:12 -07:00
1470d97f58
Remove virtual keyword. ( #4992 )
...
SetupUI()is called in the AssetEditorMainWindow constructor - it should not be virtual. Derived classes will not receive the call.
Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com >
2021-11-04 09:48:10 -07:00
12b52044d3
it renders!
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-03 21:12:29 -07:00
94110834f3
Fix material editor crash on shutdown if graph canvas gem is loaded
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-03 15:47:11 -05:00
Esteban Papp
carlitosan
lumberyard-employee-dm
Luis Sempé
tjmgd
Mike Balfour
T.J. McGrath-Daly
Guthrie Adams
Artur K
puvvadar
Chris Galvan
Chris Burel
Andre Mitchell