d55c83d0d1
Making scriptcanvas files rebuild ( #7592 )
...
The version of Lua has updated - script canvas needs to rebuild
all of the scriptcanvas files with the new lua version.
This adds the lua version into the fingerprint of all scriptcanvas jobs
which will cause them to rebuild next time you start Asset Processor.
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com >
2022-02-11 14:20:04 -08:00
4f746fddac
chore: Rename Graph to EditorGraph
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-24 16:59:23 -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
2271fa3dc6
redcode sc asset files bloodbath
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-14 15:09:46 -08:00
c5d370723e
redcoding asset handler, holder, tracker, memory asset
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 14:14:31 -08:00
d284d908b9
Make version explorer wait on AP for dependent assets
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:33 -08:00
d31c6a2774
remove uneeded files/comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:17 -08:00
d9f849b03e
File state change include external delete detection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:40 -08:00
727d1b3815
more aggressively release graph memory in version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:30 -08:00
4342501804
fixed unit test running system
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:54:33 -08:00
31c627defc
initial scriptcanvas source handle
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:52:36 -08:00
64d21c9448
Make version explorer wait on AP for dependent assets
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-08 16:11:38 -08:00
7dc03485b6
remove uneeded files/comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-02 13:18:14 -08:00
04fe1d5243
File state change include external delete detection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-22 11:03:37 -08:00
62878489a3
more aggressively release graph memory in version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-18 10:41:46 -08:00
5b9896d2c4
fixed unit test running system
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-17 13:47:51 -08:00
0b646ac693
initial scriptcanvas source handle
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-10-14 09:06:54 -07:00
5c0bbe7ac1
add SC cvar settings cache
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-09-07 14:32:24 -07:00
3822f92882
fix manual inpsection window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-09-02 17:32:53 -07:00
a353005296
only track dependent assets with valid ids, as sanity check
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-09-02 16:43:07 -07:00
9de22d5e54
Fix dependency errors after conversion to JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-09-02 16:39:04 -07:00
9688832adc
Initial fixes for graph update tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-30 08:30:56 -07:00
6f07a0b136
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
2021-07-26 11:32:12 -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
e2c1477629
fix for dependency job key on ScriptEvents from SC builder
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-15 09:46:51 -07:00
ffb235e458
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 20:17:30 -07:00
0a910a31aa
The Great ScriptCanvas Purge, Part V
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 15:05:37 -07:00
2281330a7c
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-06-30 20:42:41 -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
dcb3c71d33
Initial prefab integration
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-06-29 13:25:56 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -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
Nicholas Lawson
Michael Pollind
Mike Balfour
carlitosan
Esteban Papp
Steve Pham
alexpete