birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2564e8f8dc'
${ noResults }
o3de/Code/Editor/Controls
History
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
..
ReflectedPropertyControl Merge branch 'development' into cmake/SPEC-7484 4 years ago
BitmapToolTip.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
BitmapToolTip.h Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ColorGradientCtrl.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ColorGradientCtrl.h Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
ConsoleSCB.cpp Merge branch 'development' into cmake/SPEC-7484 4 years ago
ConsoleSCB.h Merge branch 'development' into LYN-3705-2 5 years ago
ConsoleSCB.qrc git mv Code\Sandbox\Editor Code/Editor 5 years ago
ConsoleSCB.ui git mv Code\Sandbox\Editor Code/Editor 5 years ago
ConsoleSCBMFC.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ConsoleSCBMFC.ui git mv Code\Sandbox\Editor Code/Editor 5 years ago
FolderTreeCtrl.cpp Code/Editor 4 years ago
FolderTreeCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
HotTrackingTreeCtrl.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
HotTrackingTreeCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ImageHistogramCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ImageHistogramCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ImageListCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ImageListCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MultiMonHelper.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MultiMonHelper.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
NumberCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
NumberCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QBitmapPreviewDialog.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QBitmapPreviewDialog.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QBitmapPreviewDialog.ui git mv Code\Sandbox\Editor Code/Editor 5 years ago
QBitmapPreviewDialogImp.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QBitmapPreviewDialogImp.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QToolTipWidget.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
QToolTipWidget.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SplineCtrl.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
SplineCtrl.h Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
SplineCtrlEx.cpp Merge branch 'development' into cmake/SPEC-7484 4 years ago
SplineCtrlEx.h Code/Editor 4 years ago
TextEditorCtrl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TextEditorCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TimelineCtrl.cpp Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
TimelineCtrl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TreeCtrlUtils.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
WndGridHelper.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago