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/Editor
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
..
Assets Deprecate profiler categories based on global enum 4 years ago
Components working support for editor property json serialization 4 years ago
Debugger Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Framework working support for editor property json serialization 4 years ago
GraphCanvas Merge branch 'development' into cmake/SPEC-7179 4 years ago
Include/ScriptCanvas Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Model Merge branch 'development' into cmake/SPEC-7179 4 years ago
Nodes Address additional PR feedback 4 years ago
Static Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Tests Merge branch 'development' into cmake/SPEC-7179 4 years ago
Translation Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Undo Merge branch 'development' into cmake/SPEC-7179 4 years ago
Utilities Minimal TypeInfo header/reduce std interdependencies. (#2688) 4 years ago
View more castings 4 years ago
QtMetaTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectComponent.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ReflectComponent.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ScriptCanvasEditorGem.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
Settings.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
Settings.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SystemComponent.cpp Updated path to icon that was emitting a warning 4 years ago
SystemComponent.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago