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 'f8e99cd7dd'
${ noResults }
o3de/Code/Editor/Objects
History
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
..
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 Merge branch 'development' into cmake/SPEC-2513_w4244 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 more castings 4 years ago
EntityObject.cpp Merge branch 'development' into cmake/SPEC-2513_w4244 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 Editor code: tidy up BOOLs,NULLs and overrides pt2. 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/SPEC-2513_w4244 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 Deprecate profiler categories based on global enum 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 Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
TrackGizmo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago