Commit Graph

69 Commits

Author SHA1 Message Date
carlitosan d4206270a6 Use weak reference for undo state, as it is an entirely internal class
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-06 13:37:29 -08:00
carlitosan a76e9bba69 Restore undo/redo
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-06 12:12:46 -08:00
carlitosan 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
chcurran 6fb284ff0a restore file save
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-01 23:04:07 -08:00
chcurran ca771f3adc version upgrader in a presumed working story
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-01 22:18:32 -08:00
chcurran 132d06b6da fixed unit tests bugs, removed commented out code, removed loading spam
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-24 18:55:11 -08:00
chcurran cdb858e8af Editor Script Component simplified and working
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-23 10:31:26 -08:00
chcurran 24b3167d48 EditorCOmponent build pipeline WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-22 20:34:11 -08:00
chcurran 205b2c27ee SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-22 16:04:49 -08:00
chcurran 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-11-22 11:03:49 -08:00
chcurran 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
lsemp3d 20a2a79003 Updated more node names, no longer return data type string to control tooltip display in SC
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-11-22 10:58:09 -08:00
Chris Galvan 9ec4b408fd Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker
Added property handler for SourceHandle type
2021-11-19 15:23:41 -06:00
Chris Galvan 68344f5a80 Updated Script Canvas component to use source handle property.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 14:58:01 -06:00
chcurran 7aec710cff fix graph tab selection:
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-19 12:22:12 -08:00
chcurran f1632b099c editor sc component switched over to source handle, not yet connected to file notifications
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-19 10:03:16 -08:00
chcurran 0e7d732c61 fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-15 17:15:05 -08:00
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>
2021-11-11 16:07:18 -08:00
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.
2021-11-11 11:53:51 -08:00
chcurran 0fa56ba5f8 new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-10 15:39:17 -08:00
chcurran a334ce09b4 source save in place first pass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-08 13:58:48 -08:00
chcurran 837e9f6105 source save asset-free WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-08 10:00:45 -08:00
chcurran ea5eba6e3f add file state for graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-04 15:58:19 -07:00
chcurran 12b52044d3 it renders!
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-03 21:12:29 -07:00
chcurran ad6dc8a3bd initial compile of detailed path of change to regular sc files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-10-29 16:23:20 -07:00
chcurran 1b9f6c385d Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 2021-10-28 10:51:40 -07:00
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>
2021-10-20 11:15:24 -07:00
chcurran 0b646ac693 initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-10-14 09:06:54 -07:00
Terry Michaels 00b938b6a7 Merge pull request #4212 from ppinfel/component-doc-links
Fixes various component's help URL links to correct o3de.org page
2021-10-08 10:30:13 -05:00
Pinfel 6cd770a944 Fixed in-editor "Scripting" category components reference links to o3de.org docs
Signed-off-by: Pinfel <ppinfel@gmail.com>
2021-09-19 12:57:57 -04:00
chcurran 9196e98ee6 update reporting and logging and make bug fixes
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-15 17:03:16 -07:00
chcurran 296fca722e file save finished, not tested
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-15 15:42:54 -07:00
chcurran f4dbeb6538 Fix list of manual inspection graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 18:14:00 -07:00
chcurran 3822f92882 fix manual inpsection window
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 17:32:53 -07:00
chcurran 16ed1e1882 More status reporting, fixed widget row index tracking for upgrader tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-30 18:27:14 -07:00
chcurran 782c6748ae Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-08-30 14:33:16 -07:00
chcurran 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
Esteban Papp 323d642e65 Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 18:01:54 -07:00
chcurran fe21b89d8e working support for editor property json serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-12 10:24:16 -07:00
chcurran 43dfffa3fd fix dangling component variables on cleared script, fix EntityIDNode reflection
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-28 20:58:49 -07:00
sphrose 9639003a7d LYN-4774 Fix missing box icons inside the main Viewport (#2297)
* LYN-4774 Fix missing box icons inside the main Viewport

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* V2 icons

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Bug fixes

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-07-21 16:33:04 -07:00
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
2021-07-16 15:42:37 -07:00
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>
2021-07-16 15:25:48 -07:00
Esteban Papp ffb235e458 ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-12 20:17:30 -07:00
chcurran 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
chcurran fa7accf2dc Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-06 07:27:29 -07:00
Aaron Ruiz Mora 9d5a9ff925 NvCloth automated tests use default renderer to be more stable and complete (#1850)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-05 16:52:24 +01:00
chcurran 59ff74f559 The Great ScriptCanvas Purge. Part I.
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-01 09:57:36 -07:00
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 20:42:41 -07:00
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>
2021-06-30 19:51:55 -07:00