Commit Graph

343 Commits

Author SHA1 Message Date
Esteban Papp 47f43c2e35 Fixing casing typo and type coming from CryCommon
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-16 14:05:26 -07:00
Esteban Papp 7c9653087d Builds Windows nounity and unity
Builds Linux nounity and unity

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-16 13:13:59 -07:00
jjjoness facd1e18b5 One hamburger menu to rule them all (#2232)
* Icon changes

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Icon changes to svg files

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-16 10:17:11 -05:00
sphrose a61610fb2a Merge branch 'development' into LYN-3705-2 2021-07-16 14:55:09 +01:00
Esteban Papp 032a35e495 fix Windows unity build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 18:44:38 -07:00
Esteban Papp 074518454c Merge branch 'development' into cmake/SPEC-7179 2021-07-15 16:58:58 -07:00
John Jones-Steele 45f85bb384 Merge branch 'development' into MuteAudioButtonMightBeBroken
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-15 18:22:02 +01:00
Dayo Lawal 8f22bff1fb QEditorApplication inheriting from AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-15 12:16:18 -05:00
John Jones-Steele 3b419c02e6 CHange the way the Mute Audio button works depending on the Gem availability
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-15 13:42:02 +01:00
rgba16f e32b7a7c87 Mac m1 fixes (#2150)
* Update the Mac Editor plist application bundle identifier to be different than Lumberyard
Fix the editor to have runtime dependencies on the scene modules.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix Metal RHI calling unsupported timestamp query api on M1 Macs.
Add Query for Timestamps supported on device initialization.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Remove AZ::Scene* runtime dependencies from EmotionFX gem and add AZ::SceneUI as a runtime dependency of SceneProcessing::Editor module.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-07-14 13:14:42 -07:00
Chris Galvan 8f4ded8c64 Use the proper undo sequence so that viewport camera changes are saved properly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-14 12:10:49 -05:00
Scott Romero acd5546503 [development] update mobile settings editor tool to support new project path structure (#2147)
Fixes #2087

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-14 09:41:46 -07:00
Esteban Papp 6a6be193c7 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:36:30 -07:00
Esteban Papp 5bbcf8d725 Editor/Plugins/ProjectSettingsTool
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:53 -07:00
Esteban Papp 4e3853ef46 Editor/Plugins/ProjectSettingsTool
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:30 -07:00
Esteban Papp b5c2b2a07b Editor/PluginsFFMPEGPlugin
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:12 -07:00
Esteban Papp 87ca863ed4 Editor/Plugins/EditorCommon
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:56 -07:00
Esteban Papp 35ea178e3c Editor/Plugins/EditorAssetImporter
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:38 -07:00
Esteban Papp e214f26392 Editor/Plugins/ComponentEntityEditorPlugin
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:05 -07:00
sphrose b9f2713b15 Merge branch 'development' into LYN-3705-2 2021-07-14 10:24:19 +01:00
sphrose 93cbb7c981 Review changes
Changed text case, removed ClearText API and added GameStartup motify listening.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-07-14 10:22:42 +01:00
Nicholas Van Sickle 867ae23664 Make Viewport input events fully Qt based (#2142)
* Make Viewport input events fully Qt based.

This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).

See https://github.com/o3de/o3de/issues/1889

- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Address review feedback

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Fix Linux build

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-13 20:58:48 -07:00
AMZN-ScottR 201a387c7e [mobile-settings-crash-fix] removed dep on FileUtil in ProjectSettingsToolWindow.cpp and optimize return in GetPlatformResource
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-13 17:46:35 -07:00
Esteban Papp 289f236cab Gems/LyShine
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-13 16:42:51 -07:00
AMZN-ScottR 7937ece773 [mobile-settings-crash-fix] update mobile settings editor tool to support new project path structure
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-13 15:07:16 -07:00
hultonha 5bdb73b064 Merge pull request #2024 from aws-lumberyard-dev/lyn5017_LockSelection/UnlockAll_bug
Fixed small bug with edit menu
2021-07-13 10:11:52 +01:00
sphrose 4c627405f2 Merge branch 'development' into LYN-3705-2 2021-07-13 09:42:54 +01:00
Chris Galvan df9358c492 Merge pull request #2109 from aws-lumberyard-dev/cgalvan/RemoveDeprecatedGraphicsMenuItems
Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
2021-07-12 16:57:34 -05:00
Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
Merged stabilization/2106 to development
2021-07-12 14:05:19 -05:00
Chris Galvan 2fc1062802 Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 13:42:08 -05:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
sphrose 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
John Jones-Steele 13879665df Change from PR feedback.
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-12 15:50:29 +01:00
John Jones-Steele a573d859c7 One minor change.
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-12 14:25:21 +01:00
John Jones-Steele c7d1117ebf Text changed and default behaviour changed
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-12 12:19:01 +01:00
Alex Montgomery 372ac2707f fix outliner sorting using incorrect types for comparisons (#2052)
* fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix annoying but necessary Qt type cast

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
2021-07-09 19:37:57 -07:00
Nicholas Van Sickle 8eb8088a36 Remove Cry -> Atom camera sync. (#2047)
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-09 16:25:13 -07:00
Chris Galvan b65c972392 Merge pull request #2007 from aws-lumberyard-dev/daimini/NewsBuilder/removal
Remove NewsBuilder project from Editor solution.
2021-07-09 13:42:26 -05:00
jjjoness 1b530195fc Clarify ImGui activation in Editor viewport (#1765)
* Clarify ImGui activation in Editor viewport

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* All working following changes from comments in PR

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* One more change

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* fixes from comments in PR.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed git merge error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added header to ImGuiBus.h

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fix for Jenkins error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Minor typo fix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-09 12:03:20 -05:00
aaguilea 01ed7d70aa Merge branch 'development' into lyn5017_LockSelection/UnlockAll_bug 2021-07-09 13:47:22 +01:00
aaguilea b07ed7817d Fixed small bug with edit menu
Signed-off-by: aaguilea <aaguilea@amazon.com>
2021-07-09 12:00:11 +01:00
Danilo Aimini 2cc9095702 Remove unused functions referencing the News ErrorCode class
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-08 21:35:17 -07:00
Danilo Aimini 92ff99c6a0 Remove NewsShared includes in the WelcomeDialog class
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-08 18:11:08 -07:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)
* copy frameworks to output for loose file case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* patching lrelease

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for python in loose files and bundles

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* found what the problem is, setting a version just in case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Trying to ignore other files to solve Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix some qt stuff for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of cstemp files to prevent signature failures

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 17:20:20 -07:00
Danilo Aimini 242b4923ae Remove NewsBuilder project from Editor solution, as it is no longer used.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-08 15:51:53 -07:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
Scott Romero 0730960a4f [development] Mobile settings tool validator and save fixes (#1931)
Updated and simplified the version number validation regex to support 4-component numerical only version strings
Removed stale WAF reconfigure and replaced save notification dialog to inform the user a manual reconfigure of the project may be required for the settings to be propagated
2021-07-08 11:28:42 -07:00
Esteban Papp c132b00f6e Removing some unused files from Code/Editor/Plugins (#1943)
* fix path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove some unused files from Code/Editor/Plugins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 09:46:31 -07:00
Chris Galvan 15acb6b85a Merge pull request #1422 from aws-lumberyard-dev/nvsickle/CameraInputHardening
Switch RenderViewportWidget to Qt based events instead of AzFramework ones
2021-07-08 11:23:31 -05:00
Qing Tao 6d9230e292 ATOM-15939 Add support to capture attachment for ParentPass (#1887)
* ATOM-15939 Add support to capture attachment for ParentPass
- Moved the attachment read back support to Pass class so it supports both ParentPass and RenderPass.
- Added support to output input or output state of an InputOutput attachment.
- Enabled showing ParentPass attachments in PassTree tool.

Signed-off-by: Tao <qingtao@amazon.com>
2021-07-08 08:23:37 -07:00