4856c47d3e
Removed optimization pragma
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
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
454d6405b0
Merge pull request #6465 from aws-lumberyard-dev/scripting/catalog_load
...
Code maintenance, improved OnCatalogLoaded logic and track additions …
4 years ago
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
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
4f00718a38
fix linux build error, change translation system errors to warnings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
72bfd8bdf8
Script Canvas node translation system and naming consistency
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
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
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
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
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
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com>
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com>
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
c2cbd430fe
Integrating up through commit 90f050496
5 years ago
lsemp3d
Mike Balfour
lumberyard-employee-dm
carlitosan
Guthrie Adams
Esteban Papp
Steve Pham
alexpete