ec1a08d487
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/ConfigGroup.cpp
# Code/Editor/ControlMRU.cpp
# Code/Editor/CryEdit.cpp
# Code/Editor/CryEdit.h
# Code/Editor/IEditorImpl.cpp
# Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
2021-08-10 09:23:34 -07:00
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
2021-08-06 10:08:37 -07:00
fd616fdcfb
Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-06 10:32:38 -04:00
56dee47c6b
Address more PR feedback
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 11:56:09 -04:00
c6760d8935
Editor code: tidy up BOOLs,NULLs and overrides pt3.
...
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 3 of a split #2847
Signed-off-by: Nemerle <nemerle5+git@gmail.com >
2021-08-05 16:48:00 +02:00
73fee0c57e
Camera Component, Editor Viewport Widget refactoring.
...
- Handle changing of active camera entirely inside CameraComponentController
- Remove a LOT of legacy Cry things related to cameras
- Add a CameraSystemComponent to handle ActiveCameraRequestBus and CameraSystemRequestBus
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 10:05:19 -04:00
a14b4e478e
Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 17:56:56 -07:00
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com >
2021-07-16 15:25:48 -07:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
e34e36cb35
git mv Code\Sandbox\Editor Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 13:55:28 -07:00
Esteban Papp
Yuriy Toporovskyy
Nemerle
Steve Pham