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 '6b96be82ea'
${ noResults }
o3de/Code/Editor/Objects
History
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
 		4 years ago
..
AxisGizmo.cpp Deprecate profiler categories based on global enum 4 years ago
AxisGizmo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
BaseObject.cpp Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
BaseObject.h Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
ClassDesc.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ClassDesc.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DisplayContext.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DisplayContext.h change conversions to static_cast 4 years ago
DisplayContextShared.inl Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
EntityObject.cpp Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
EntityObject.h Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
Gizmo.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Gizmo.h Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
GizmoManager.cpp Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
GizmoManager.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
IEntityObjectListener.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
LineGizmo.cpp Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
LineGizmo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ObjectLoader.cpp More fixes for Code/Editor 4 years ago
ObjectLoader.h Merge branch 'development' into cmake/SPEC-7182 4 years ago
ObjectManager.cpp Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
ObjectManager.h Sandbox 4 years ago
ObjectManagerEventBus.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ObjectManagerLegacyUndo.cpp Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
ObjectManagerLegacyUndo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SelectionGroup.cpp Code/Editor 4 years ago
SelectionGroup.h Sandbox 4 years ago
SubObjSelection.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SubObjSelection.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
TrackGizmo.cpp Code/Editor 4 years ago
TrackGizmo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago