You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
o3de/Gems/ScriptCanvas/Code
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
4 years ago
..
Asset Merge branch 'development' into cmake/SPEC-7179 4 years ago
Builder display unused variables in the editor; bump builder version for recent change to EntityId nodes 4 years ago
Editor Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Include/ScriptCanvas Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Source initial json serialization for editor sc properties 4 years ago
Tests Merge branch 'development' into cmake/SPEC-7179 4 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_common_files.cmake initial json serialization for editor sc properties 4 years ago
scriptcanvasgem_debugger_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_editor_asset_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_editor_builder_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_editor_files.cmake Merge branch 'development' into cmake/SPEC-7179 4 years ago
scriptcanvasgem_editor_shared_files.cmake Merge branch 'development' into cmake/SPEC-7179 4 years ago
scriptcanvasgem_editor_static_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_editor_tests_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_game_files.cmake Merge branch 'development' into cmake/SPEC-7179 4 years ago
scriptcanvasgem_runtime_asset_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scriptcanvasgem_tests_files.cmake Merge branch 'development' into cmake/SPEC-7179 4 years ago