590de17343
Delete code which was only commented out
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 10:05:20 -04:00
9d9ce7cc33
Fixup merge errors
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 10:05:19 -04:00
2079b274c3
Fixup merge errors
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 10:05:19 -04: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
92a5fb6df2
Add a toggle to clear console every time ctrl+G is activated
...
LYN-3705 As a dev I want a toggle to clear console every time I hit ctrl+G
2021-08-05 08:11:31 -05:00
6c7365918b
Fix a few issues in CCryEditDoc
...
Merge pull request #2846 from nemerle/cryedit_fixups_try2
2021-08-05 10:36:08 +01:00
5640880aea
Changes to update where some viewport actions are called from (legacy removal)
...
Merge pull request #2828 from aws-lumberyard-dev/legacy_shortcut_update
This change removes code from CCryEditApp that no longer needs to be there
2021-08-05 09:56:56 +01:00
126280bb93
Merge branch 'development' into LYN-3705-2
2021-08-05 09:51:31 +01:00
1169c82b98
Make camera controller priority customizable ( #2826 )
...
* make 'should handle' logic customizable
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* updates to get priority function
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* minor comment tweak
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-08-05 09:45:03 +01:00
627dcc49f1
GetActivePathName was using default - constructed enum DocumentEditingMode()
...
Also, SaveLevel was not using destName when constructing newFilePath
Other code changes:
* LogLoadTime is simplified by using QFile
* reduce nesting in DoSaveDocument by using early return.
* marked a few eligible methods as const
* Simplified OnEnvironmentPropertyChanged a bit
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-08-04 21:01:52 +02:00
21ca3a4aea
The enable-gem command registers gem with project if not registered ( #2817 )
...
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json
Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding quoting around the invocation of the OpenProjectManager command
The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-08-04 13:13:28 -05:00
c9e16c1c42
Erased some legacy function that are no longer necessary
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-04 14:44:50 +01:00
d06ec45aaa
changes to the move rotate and scale
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-04 13:05:00 +01:00
6fb250c66b
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-04 09:52:42 +01:00
eeed7df429
fixing no unity builds
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-03 20:24:36 -07:00
e28602dbbb
linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-03 17:59:35 -07:00
eb94d5b7a0
Merge pull request #2717 from aws-lumberyard-dev/nvsickle/EditorCameraFOV
...
Ensure Editor FOV corrects on viewport resize
2021-08-03 12:41:22 -05:00
dd3f0b86e0
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/ToolBox.cpp
2021-08-02 18:45:25 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
a14b4e478e
Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 17:56:56 -07:00
061cb98f74
auto-search/replace
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 16:07:23 -07:00
db7536acda
Gems/Maestro
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 11:44:34 -07:00
74498089c3
Ensure Editor FOV corrects on resize
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-08-02 11:22:19 -07:00
37c3f01771
Removed legacy ObjectIcons and shelve icons from Editor.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-02 12:27:03 -05:00
7f9c6df67b
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-02 09:27:21 +01:00
f665f572f3
Gems/Atom builds
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-30 18:53:50 -07:00
70b3840288
Fix the home key popping up ImGui when it shouldn't. ( #2620 )
...
This disables WM_INPUT forwarding to the input system while in game mode and makes ImGui listen to the synthetic keyboard events from the viewport instead - these synthetic events go through Qt's event system, so will only show up when the viewport "sees" a home key press.
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-29 16:30:45 -05:00
f0cafd0e9d
Create RUN target as helpers for the project-centric workflow ( #2520 )
...
* Create RUN target as helpers for the project-centric workflow
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* typo fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-28 15:53:14 -07:00
9c72510a4f
removing files that got added by rebase
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com > (+1 squashed commits)
Squashed commits:
[a19269426] fixing more strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com > (+1 squashed commits)
Squashed commits:
[d2a049324] fixing more strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com > (+1 squashed commits)
Squashed commits:
[a1ff4c101] trying to build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-28 09:54:42 -07:00
a7b613d388
Fixing typos in comments in AffineParts.h file ( #2407 )
...
Signed-off-by: jwlodek <jakub.wlodek@stonybrook.edu >
2021-07-28 08:56:46 -07:00
074e33081f
more fixes for w4267
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:32:11 -07:00
20a4ec9b7d
Sandbox
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:32:01 -07:00
c9b3ed8bc7
Merge pull request #2382 from aws-lumberyard-dev/audio/amzn-phist/RemoveLegacyXml
...
Replaces usage of legacy XML apis with RapidXml
2021-07-26 18:58:01 -07:00
ed6dbb48f4
Fixes failing tests and linux compile error
...
Replaced a 'uint32' with AZ::u32 to fix a linux compile error that
likely came about after cleaning up includes. Rewrites a failing unit
test after the code under test was updated from CryPak to AZ::IO.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-07-26 18:19:07 -05:00
7f84a4318c
Add an Orthogonal Projection option to the Camera Gem ( #2414 )
...
* Add an Orthogonal Projection option to the Camera Gem
This adds a check-box to opt into an ortho projection along with a half-width parameter to adjust the size of the visible area. Includes some light tweaks to ensure debug rendering looks OK and that we generate a correct camera state for these non-perspective views.
Known issue: while in "Be this camera" mode in the Editor using an ortho projection manipulators aren't working correctly. This appears to be a downstream issue with CameraState consumers not actually checking the ortho flag.
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Fix some typos
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Account for reversed depth buffer
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Clarify depth reversal for MakeOrthographicMatrixRH
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-26 13:58:50 -07:00
b815c203da
(Continuation) Implemented automation paralellization & standarization ( #1718 )
...
Engine improvements/fixes
Fixed behavior that made the editor automated test to be sometimes stuck if lost the focus is lost.
Added support for specifying multiple tests to in batch to the editor, this is achieved by passing --runpythontest with the tests separated by ';'
Added new cmdline argument --project-user-path for overriding the user path. This allows to have multiple editors running writing logs and crash logs in different locations.
Moved responsability of exiting after a test finishes/passes out of ExecuteByFilenameAsTest, callers will use the bool return to know if the test passed.
Editor test batch and parallelization implementation:
Now the external python portion of the editor tests will be specified via test specs which will generate the test. Requiring no code. This is almost a data-driven approach.
Tests can be specified as single tests, parallel, batchable or batchable+parallel
Command line arguments for pytest to override the maximum number of editors, disable parallelization or batching.
Automated tests for testing this new editor testing utility
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk >
2021-07-22 12:57:23 +02:00
ce5c385553
Merge branch 'development' into LYN-3705-2
2021-07-22 10:39:14 +01:00
231f09d899
Merge pull request #2322 from aws-lumberyard-dev/hultonha_LYN-1866_viewport-ui-focus-tidy
...
ViewportUi related tidy-up changes
2021-07-22 10:02:56 +01:00
9639003a7d
LYN-4774 Fix missing box icons inside the main Viewport ( #2297 )
...
* LYN-4774 Fix missing box icons inside the main Viewport
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* V2 icons
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Bug fixes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-07-21 16:33:04 -07:00
b198d653c1
Fix FOV getting reset upon entering game mode ( #2216 )
...
* Fix FOV getting reset upon entering game mode
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Ensure scenes load with the correct FOV
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-21 09:53:17 -07:00
d086e45d22
Fix getting stuck in game mode with some UI Assets ( #2207 )
...
- LyShine assets with "consume all input" could accidentally eat the escape event that exited game mode
- The main window has a shortcut for exiting game mode, but this wasn't being triggered in this context, so we go ahead and catch the Escape key event ASAP in EditorViewportWidget to ensure the game mode exit fires
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-21 09:52:49 -07:00
ec3e1f98c1
Merge branch 'development' into hultonha_LYN-1866_viewport-ui-focus
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-21 14:01:43 +01:00
7414843d13
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +01:00
4762867856
fix for focus being removed from main viewport widget when interacting with viewport ui elements
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-20 18:04:08 +01:00
706233f72c
Merge branch 'development' into cmake/SPEC-7179
2021-07-19 15:48:29 -07:00
7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
...
Addition of a base AzQtToolsApplication class
2021-07-19 13:32:09 -05:00
080d10ede9
continue to show cursor while using RMB until context menu pop-up is fixed
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-19 11:55:38 +01:00
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
2021-07-16 15:42:37 -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
83c5028af6
Fix windows release and a warning issued in Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-16 14:24:55 -07:00
Yuriy Toporovskyy
Terry Michaels
hultonha
sphrose
nemerle
lumberyard-employee-dm
aaguilea
igarri
Esteban Papp
Chris Galvan
nvsickle
pappeste
Jakub Wlodek
Pratik Patel
amzn-phist
AMZN-AlexOteiza
hultonha
Guthrie Adams
Steve Pham