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/Code/Editor/Controls/ReflectedPropertyControl
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
4 years ago
..
resources git mv Code\Sandbox\Editor Code/Editor 5 years ago
PropertyAnimationCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyAnimationCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyGenericCtrl.cpp Code/Editor 4 years ago
PropertyGenericCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyMiscCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyMiscCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyMotionCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyMotionCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyResourceCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyResourceCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectedPropertiesPanel.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ReflectedPropertiesPanel.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectedPropertyCtrl.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ReflectedPropertyCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectedPropertyCtrl.qrc git mv Code\Sandbox\Editor Code/Editor 5 years ago
ReflectedPropertyItem.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ReflectedPropertyItem.h more fixes for w4267 4 years ago
ReflectedVar.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectedVar.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ReflectedVarWrapper.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ReflectedVarWrapper.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago