Esteban Papp
711b332ebe
Gems/ScriptCanvas*
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-10 20:24:15 -07:00
Esteban Papp
9f6d4125b8
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-09 11:50:40 -07:00
Esteban Papp
d836503814
some more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-09 11:50:13 -07:00
carlitosan
52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
...
Upgrades and stability fixes for version explorer
2021-09-09 10:42:53 -07:00
Steve Pham
e6573766c2
Fixes for release builds for unused variable warnings ( #4000 )
...
Signed-off-by: Steve Pham <spham@amazon.com >
2021-09-08 21:13:36 -07:00
Esteban Papp
52607ce2c0
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-03 20:38:07 -07:00
chcurran
c8ed6d287c
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
2021-09-02 18:14:39 -07:00
chcurran
3b119b6f32
hot fix for json event input serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-31 14:07:19 -07:00
chcurran
f5485fa675
merge lastest; add extra data to scan result
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-30 16:27:55 -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
862df096db
Add file information to Version; improve Method deserialization warnings; add SC unit test content to builders
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-30 14:33:01 -07:00
Steve Pham
fa0f2a1007
Fix unused warnings release ( #3677 )
...
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS
Signed-off-by: Steve Pham <spham@amazon.com >
2021-08-30 13:10:41 -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
6b96be82ea
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CrySystem/Log.cpp
# Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.hxx
# Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
# Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
# Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
2021-08-25 11:47:19 -07:00
Jeremy Ong
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:29 -06:00
Esteban Papp
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:35 -07:00
chcurran
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 16:02:58 -07:00
Esteban Papp
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:03:37 -07:00
chcurran
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-20 19:35:38 -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
Esteban Papp
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
Esteban Papp
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:12 -07:00
Esteban Papp
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 16:16:28 -07:00
Esteban Papp
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
Jeremy Ong
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
chcurran
ca8a148b63
fix Linux compile error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 12:16:39 -07:00
chcurran
b813f2fbf4
add compiler flag for object stream support of SC editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 10:56:02 -07:00
chcurran
0270fb7fbe
Initial saving/loading of JSON serialization of sc editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 13:47:20 -07:00
Esteban Papp
14e7754334
More fixes for warnings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:09 -07:00
pappeste
67a5bc98ce
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:40:53 -07:00
Esteban Papp
e9b4f48f71
more fixes, will merge fixes for w4245 and w4389
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:06:22 -07:00
pappeste
b52516cdec
ScripCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:21 -07:00
chcurran
d2c87fd21f
initial json serialization for editor sc properties
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-11 17:30:16 -07:00
chcurran
aaa847a569
Remove empty User Functions and Script Event sections
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-11 14:40:34 -07:00
chcurran
893a80a54e
Fix variables names in the property window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-30 11:37:40 -07:00
chcurran
6f07a0b136
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
2021-07-26 11:32:12 -07:00
Luis Sempé
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
2021-07-21 14:48:24 -07:00
lsemp3d
6c4fdd3af5
Missing early out if no contract exists
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-07-20 13:13:43 -07:00
lsemp3d
8d56a031ef
crash guard when the data has a list with an empty contract
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-07-20 13:13:41 -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
chcurran
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
Esteban Papp
ffb235e458
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 20:17:30 -07:00
chcurran
45b024bed1
Remove dead backend code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-08 16:12:45 -07:00
chcurran
b63c9a87db
compile time null checks avaiable for method node
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-08 15:08:55 -07:00
chcurran
3f231075fe
Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-08 08:53:19 -07:00
lumberyard-employee-dm
3be4c9a393
Removing extra whitespace from the ScriptCanvas Node Library files
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-07 16:33:16 -05:00
chcurran
29652994d8
The Great ScriptCanvas Purge, Part VIII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-07 10:45:16 -07:00
chcurran
75933ff7fd
The Great ScriptCanvas Purge, Part VII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 21:03:31 -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