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
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
295c836ed8
clean up comments, add set type action in disabled form
...
Signed-off-by: carlitosan <82187351+carlitosan@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é
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
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
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
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
chcurran
12b52044d3
it renders!
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Guthrie Adams
94110834f3
Fix material editor crash on shutdown if graph canvas gem is loaded
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Alex Peterson
7ddcdffed7
Move Qt Toast Notifications from GraphCanvas into Framework
...
Move the existing Qt Toast Notification QWidgets, EBuses and logic from the GraphCanvas gem into AzQtComponents and AzToolsFramework so they can be re-used.
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Artur K
f44169f7fa
Cleanup SerializeContext.h pt.1 ( #4264 )
...
* Remove AssetSerializer inclusion from SerializeContext header
Moved a few Reflect methods to new cpp files.
In addition, some preparations for further header dependency reductions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix smoke test lua failures.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Windows build fixes.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Missing license headers
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix white-space issues.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix inheritance list wrapping broken by older clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp
fa1d1bd2fc
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp
2f5a39176d
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp
939c188448
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste
4ee9adf522
GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
d7a4b0d930
fix for double asset registration and multiple outs from loop nodes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
4 years ago
Steve Pham
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
Esteban Papp
472867a411
GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Steve Pham
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
amzn-mgwynn
ce955715a8
Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
...
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
5 years ago
mgwynn
fb3940fa31
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
5 years ago
Steve Pham
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago