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
3d15382fb6
Camera Component, Editor Viewport Widget refactoring.
...
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
2021-08-09 14:01:41 +01:00
7b5ecfb7d9
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-09 09:32:42 +01: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
9a711cbb8c
Editor code: tidy up BOOLs,NULLs and overrides pt6.
...
Merge pull request #2877 from nemerle/tidy_up_editor_code_a_bit_split6
2021-08-06 12:49:05 +01:00
9d2b99b558
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-06 10:18:26 +01:00
e28d04aea6
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Editor/CryEditDoc.h
# Code/Legacy/CryCommon/CryArray.h
# Code/Legacy/CryCommon/CryString.h
# Code/Legacy/CryCommon/UnicodeBinding.h
# Code/Legacy/CrySystem/LocalizedStringManager.cpp
# Gems/LyShine/Code/Source/StringUtfUtils.h
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-05 20:05:25 -07:00
7448bccea3
Bunch of small bug fixes ( #2813 )
...
* fix an error with addr_impl_ref assignment operator
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* chrono duration unary '+' was missing a return
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* HierarchyMenu constructor logic fix
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* at least assert in case of invalid arguments to ring_buffer::insert
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* EditorSettings using incorrect string_view::find result comparison
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-08-05 14:10:08 -07:00
aa12434728
removing some dead code, commented code referring old types, static AZStd::strings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 12:47:36 -07:00
769fd78189
Editor code: tidy up BOOLs,NULLs and overrides pt6.
...
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 6 of a split #2847
Signed-off-by: Nemerle <nemerle5+git@gmail.com >
2021-08-05 16:52:43 +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
7f9c6df67b
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-02 09:27:21 +01:00
7414843d13
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +01: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
17a79daad8
Add clear console when starting gamemode setting.
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-07-12 16:19:29 +01:00
2ccede7435
Merge branch 'develop' into LYN-4700
2021-07-05 15:52:55 +01:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05: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
hultonha
igarri
Yuriy Toporovskyy
Artur K
Nemerle
sphrose
Steve Pham
Chris Galvan