birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f20d17398cb20855fc3f91def3fe99636ff0ee8d
o3de/Code/Editor/Objects
T
History
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
2021-08-25 14:50:05 -07:00
..
AxisGizmo.cpp
Deprecate profiler categories based on global enum
2021-08-18 17:33:09 -06:00
AxisGizmo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseObject.cpp
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
BaseObject.h
PR comments/fixes
2021-08-25 14:06:26 -07:00
ClassDesc.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ClassDesc.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplayContext.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplayContext.h
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
DisplayContextShared.inl
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
EntityObject.cpp
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
EntityObject.h
Editor code: tidy up BOOLs,NULLs and overrides pt2.
2021-08-09 15:29:54 +01:00
Gizmo.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Gizmo.h
Editor code: tidy up BOOLs,NULLs and overrides pt2.
2021-08-05 16:46:38 +02:00
GizmoManager.cpp
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
GizmoManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEntityObjectListener.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LineGizmo.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt2.
2021-08-05 16:46:38 +02:00
LineGizmo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ObjectLoader.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -07:00
ObjectLoader.h
Merge branch 'development' into cmake/SPEC-7182
2021-08-10 18:05:28 -07:00
ObjectManager.cpp
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-25 11:47:19 -07:00
ObjectManager.h
Sandbox
2021-07-27 19:32:01 -07:00
ObjectManagerEventBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ObjectManagerLegacyUndo.cpp
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
ObjectManagerLegacyUndo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectionGroup.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
SelectionGroup.h
Sandbox
2021-07-27 19:32:01 -07:00
SubObjSelection.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SubObjSelection.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackGizmo.cpp
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-25 14:50:05 -07:00
TrackGizmo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00