9475d1612b
Merge branch 'development' into carlitosan_fix_for
4 years ago
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
055915ec4f
merge from latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
1e3c55246a
Merge pull request #2490 from aws-lumberyard-dev/carlitosan/fix_null_check
...
remove null data check from connected slots
4 years ago
76a3195487
remove null data check from connected slots
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
223654c41b
Add fix and unit tests for pure on graph start functions and direct entity id input
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b8300c6248
fix entity reference removal when not in a variable
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3ad8f0dbf9
adjust location of disabling SC unit tests on Linux
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
6f07a0b136
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
a87318c52a
temporarily disable SC unit tests on Linux until a file case issue is solved
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
9a4a7bc156
Script Canvas: Fixed Scope and Initial Value selection boxes
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
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>
4 years ago
eb24edbce7
Merge pull request #2304 from aws-lumberyard-dev/scripting/contract_crash_fix
...
Crash guard when the data has a list with an empty contract
4 years ago
6c4fdd3af5
Missing early out if no contract exists
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
8d56a031ef
crash guard when the data has a list with an empty contract
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
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
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
e2c1477629
fix for dependency job key on ScriptEvents from SC builder
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b7f71fb153
others
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
41dd7054b7
Restore BCO destructor delete
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
cef4e5278d
Gems/Camera
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ffb235e458
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
11eb920e40
Removal of dead code and bug fixes for reflection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
45b024bed1
Remove dead backend code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
b63c9a87db
compile time null checks avaiable for method node
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
3f231075fe
Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
21b511b174
Merge branch 'carlitosan/thecleansing' of https://github.com/aws-lumberyard-dev/o3de into carlitosan/thecleansing
5 years ago
3be4c9a393
Removing extra whitespace from the ScriptCanvas Node Library files
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
f9f711c039
Removing superfluous whitespace.
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
2dce2eee2d
The Great ScriptCanvas Purge, Part X
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
27577a2e49
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
5 years ago
29652994d8
The Great ScriptCanvas Purge, Part VIII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
75933ff7fd
The Great ScriptCanvas Purge, Part VII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
65ad412f3e
The Great ScriptCanvas Purge, Part VI
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
0a910a31aa
The Great ScriptCanvas Purge, Part V
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
360236b89e
The Great ScriptCanvas Purge, Part IV
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
fa7accf2dc
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
5 years ago
9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete ( #1850 )
...
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
88c328c6e2
The Great ScriptCanvas Purge, Part III
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
fea83b0b51
The Great ScriptCanvas Purge, Part II
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
59ff74f559
The Great ScriptCanvas Purge. Part I.
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
8cd07c6f4b
update license on new files
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
2281330a7c
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
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
carlitosan
lsemp3d
sphrose
Esteban Papp
Steve Pham
Chris Galvan
lumberyard-employee-dm
hultonha
pereslav
Aaron Ruiz Mora