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
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
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
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
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
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
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 >
2021-10-20 11:15:24 -07:00
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 >
2021-09-29 11:31:01 -05:00
fa1d1bd2fc
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-10 20:19:06 -07:00
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:03:37 -07:00
2f5a39176d
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:01:28 -07:00
939c188448
Gems/GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:34 -07:00
4ee9adf522
GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:03:48 -07:00
d7a4b0d930
fix for double asset registration and multiple outs from loop nodes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-28 16:51:25 -07:00
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
2021-07-16 15:42:37 -07:00
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 >
2021-07-16 15:25:48 -07:00
472867a411
GraphCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 20:12:47 -07:00
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 >
2021-06-30 19:51:55 -07:00
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
2021-06-25 19:18:03 -04:00
fb3940fa31
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-23 21:05:17 -04:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
3dec5d3b71
LYN-2537 engine assets ( #254 )
...
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder
* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file
* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message
* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets
* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder
* Moving the Engine Settings Registry folder from Engine/Registry -> Registry
* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator
* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now
* Fixed Atom Shader Preprocessing when running using an External Project
* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable
* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root
* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder
* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder
* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder
* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension
* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command
* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder
* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames
* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder
* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available
* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder
* Updating References to EngineAssets source asset folder in code to be the Assets source folder
* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders
* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner
* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test
Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory
* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory
* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
53e84b3820
Fixed scoping rules for variables
2021-04-15 09:35:09 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Mike Balfour
carlitosan
lsemp3d
Guthrie Adams
Artur K
Alex Peterson
Esteban Papp
pappeste
Steve Pham
amzn-mgwynn
mgwynn
lumberyard-employee-dm
Chris Burel
luissemp
alexpete