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/Include
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
..
Command.h Code/Editor 4 years ago
EditorCoreAPI.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
EditorCoreAPI.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
HitContext.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IAnimationCompressionManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IAssetItem.h Editor code: tidy up BOOLs,NULLs and overrides pt1. 4 years ago
IAssetItemDatabase.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IAssetViewer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IBaseLibraryManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ICommandManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IConsoleConnectivity.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDataBaseItem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDataBaseLibrary.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDataBaseManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDisplayViewport.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEditorClassFactory.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
IEditorFileMonitor.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEditorMaterial.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEditorMaterialManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IErrorReport.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEventLoopHook.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IExportManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IFacialEditor.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IFileUtil.h Merge branch 'development' into cmake/SPEC-7484 4 years ago
IGizmoManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IIconManager.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
IImageUtil.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IKeyTimeSet.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ILogFile.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IObjectManager.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
IPlugin.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IPreferencesPage.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IRenderListener.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IResourceSelectorHost.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISourceControl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISubObjectSelectionReferenceFrameCalculator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ITextureDatabaseUpdater.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ITransformManipulator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IViewPane.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ObjectEvent.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SandboxAPI.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago