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
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
360236b89e
The Great ScriptCanvas Purge, Part IV
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 13:13:16 -07:00
fa7accf2dc
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-06 07:27:29 -07:00
fea83b0b51
The Great ScriptCanvas Purge, Part II
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-01 17:08:16 -07:00
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
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
10081fefb9
Remove unwanted entries from node palette
2021-06-11 16:28:34 -07:00
76a6df341b
SPEC-2513 Fixes to enable w4457
2021-06-04 10:51:47 -07:00
a30d8eb886
Expose Raw BC Properties to Node Palette.
2021-05-05 14:59:08 -07:00
ab5ffc7604
Removed BC Setters from showing up in the node palette
2021-04-30 09:35:41 -07:00
b7aeb98d5a
Merge branch 'main' into carlitosan-parser-fixes
2021-04-23 15:55:19 -07:00
bc11711ab9
Fix and test for LYN-2817, container input in user functions
2021-04-23 15:52:29 -07:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
cb7a26ce5e
Editor for stability and overloaded nodes. LYN-2904, LYN-3059, LYN-3234, LYN-2888
2021-04-22 16:13:24 -07:00
134f07eb5a
Fixes for node palette exclusion, restrict asset variable type to fix LYN-3090
2021-04-21 21:36:31 -07:00
bfe192cce8
Merge branch 'main' into carlitosan_scripting_first
2021-04-20 16:45:03 -07:00
961f2ef113
Replace string/hash based execution out look up for indices, 10-50% speed up in lookup code. Fix bugs calling dependent functions.
2021-04-20 12:04:57 -07:00
83324762b5
Brought over SC's command line fixes and add_node example script
2021-04-20 10:40:53 -07:00
ba04c7858f
Fixed ability to set Array as data input into function definition node, WIP
2021-04-15 16:01:36 -07:00
f5791ee60a
Fixed compile error and added Setters to Node Palette
2021-04-15 10:08:07 -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
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -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
Esteban Papp
Steve Pham
chcurran
chcurran
luissemp
Chris Burel
alexpete