birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,120 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '60adc098da'
${ noResults }
Commit Graph

97 Commits (60adc098da2d3026280bd0caa10915d6c8e6e14f)

Author SHA1 Message Date
lumberyard-employee-dm 60adc098da
Fixed implicit conversion to bool in AZStd::to_string. (#7755) 
This specifically implies to the value returning to_string overloads

Added a range based StringFunc::Join overload.

Reduced the number of AZStd::to_string calls in the TranslationKey
operator<< function.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
lsemp3d 4856c47d3e Removed optimization pragma 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d b12d696522 Fixed ambiguous translation key when a property and a method share the same name 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 1b52339b6b PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d a33529e860 Fixed group and bookmark display on graph load 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

A
 4 years ago
Esteban Papp 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>
 4 years ago
Esteban Papp 0f59718ff0 Removes CommentConstructMenuActions.cpp/h from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 504009a63b Removes definitions.cpp from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 7292fea50f Removes VariableNodeBus.h from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp f286946377 Removes VariableDataInterface.h from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 592a7dd9b3 Removes DoubleDataInterface from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 886a9631c7 Removes CommentLayerControllerComponent from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 640f4980cd Removes VariableReferenceNodePropertyDisplay.h/cpp from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 78ae3fdb80 Removes tools.cpp from Gems/GraphCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 56475f529c
Merge pull request #6911 from aws-lumberyard-dev/carlitosan-sc-bug-bash-4 
Make SC User data slots proper, immutable variable references
 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
lumberyard-employee-dm 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>
 4 years ago
carlitosan 4e755cc258 Add variable, datum sanity for user added slots 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Luis Sempé 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
 4 years ago
tjmgd 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>
 4 years ago
Luis Sempé 454d6405b0
Merge pull request #6465 from aws-lumberyard-dev/scripting/catalog_load 
Code maintenance, improved OnCatalogLoaded logic and track additions …
 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
lumberyard-employee-dm 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>
 4 years ago
lumberyard-employee-dm 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>
 4 years ago
lsemp3d c7c96d8baf Code maintenance, improved OnCatalogLoaded logic and track additions and removals 
Signed-off-by: lsemp3d <58790905+lsemp3d@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
chcurran 20147ddafb it renders! 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
T.J. McGrath-Daly 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>
 4 years ago
lsemp3d 72bfd8bdf8 Script Canvas node translation system and naming consistency 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Guthrie Adams 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>
 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
lsemp3d c7c2eae980 PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d d1c683b8ee If the asset catalog gets reloaded, clear the translation to avoid duplicates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Luis Sempé 3922280cec
Merge pull request #6006 from aws-lumberyard-dev/scripting/text_updates_pass7 
Updated GameLift names, improved Getter/Setter generation
 4 years ago
lsemp3d d2595272dc Removed unused variable 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 637c12836d Removed code that lead to double asset handler registration 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Artur K 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>
 4 years ago
lsemp3d 91076dbf79 Removed temporary migration code to replace 'key' entry in names files 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 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>
 4 years ago
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 4 years ago
lsemp3d 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>
 4 years ago
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 4 years ago
Chris Galvan 21c3aba7da Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
lsemp3d 35b4f6a538 Replaced float with AZ::u32 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d cffd93642e Reverted unnecessary change 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d ca66c609aa Added user setting to change the Script Canvas node palette context menu 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 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>
 4 years ago
Luis Sempé 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.
 4 years ago