birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,965 Commits 3 Branches 3 Tags
9ecb746563909b6092156ffade30d25077508e44
Commit Graph

220 Commits

Author SHA1 Message Date
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
Chris Galvan 30f8c75613 Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons 
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
 2021-07-07 16:39:46 -05:00
nvsickle 4babf69361 Address a few more review things 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:09 -07:00
nvsickle 042e465622 Harden a few pieces of viewport controller logic 
-Don't eat mouse/keyboard release events in the ViewportManipulatorController
-Do a key activity check in the LegacyViewportCameraController instead of checking state (this could be done elsewhere but it seems to be working as-is and is scheduled to go away)
-Ignore idle mouse delta updates sent to the modular camera controller

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:02 -07:00
AMZN-ScottR 34f70cb324 [mobile-settings-fixes] removed stale WAF reconfigure process on settings save 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 13:17:00 -07:00
AMZN-ScottR 11d36b0b5b [mobile-settings-fixes] simplified and updated version validation regex to support 4 component strings 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 12:49:34 -07:00
nvsickle 6b76eceb1f Add GetDpiScaleFactor to native window API 
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:08 -07:00
Chris Galvan 635473e5cf [LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:29:18 -05:00
hultonha 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 16:25:06 +01:00
hultonha 40726a32dc Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de 
stabilization2106 -> development merge (210706)
 2021-07-07 16:08:06 +01:00
hultonha 51733f3809 Fix for rotation matching and resetting also scaling the entity transform (#1856) 
* fix issue with rotation matching (ditto)

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for context menu appearing

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor tidy-up in EditorContextMenu

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add option to disable cursor during free-look

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes after PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 15:48:33 +01:00
igarri 26d9a3b5b3 Fixed tabs 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-07 13:54:18 +01:00
AMZN-Alexandre Corcia Aguilera 4f523e496f Cherry Picking (lyn1751) (#1854) 
* Cherry Picking (lyn1751)

Problem with DCO so we need to cherry pick this branch.

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

* Cherry picking #2

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

* Cherry picking 3

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

* Changed variables reverseurls
This was just changing some name variables.

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

* Changes from past PR

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

* changes from past PR and fixed small bug:
Also removed some legacy code from Resources.h

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

* couple of changes from actual PR

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

* fixed copyright issues for AR

Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-07 13:28:59 +01:00
amzn-sean 23c0440371 tick system while in track view batch render. (#1899) 
As the batch render will disable Editor idle processing which handles the tick.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-07-07 12:39:01 +01:00
igarri 2a24680535 Merge branch 'develop' into LYN-4700 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-07 12:23:24 +01:00
AMZN-Igarri 64697350bc LYN-4806: Switch Asset Browser Mode Button (Fix) (#1852) 
* Adding dropdown for view

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

* Adding Asset Browser Mode selector button

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

* Added display State Enum

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

* changed over to AZStd::unique_ptr

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

* added pointers

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

* Fixing pointers

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

* Fixing parenting

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

* Changes from Code Review Feedback

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

* Fixed wrong condition

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

* Added Button Icon

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

* Fixing Copyright Header

Signed-off-by: igarri <igarri@amazon.com>
 2021-07-07 10:53:21 +01:00
hultonha 2ea9bfb144 merge stabilization/2106 into development 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-06 17:34:04 +01:00
igarri 2ccede7435 Merge branch 'develop' into LYN-4700 2021-07-05 15:52:55 +01:00
Tom Hulton-Harrop 45b83e49da Move camera properties from CVars to the Settings Registry (#1766) 
* updates to camera inputs

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update test names to include types

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* move all camera input controls to the settings registry

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes before PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-05 13:08:05 +01:00
Terry Michaels 2d060d7466 Updated splash and about screens (#1839) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-07-02 18:38:28 -05:00
Chris Galvan 40f9761f86 Fixed more copyright header issues caused by script replacement 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 16:21:26 -05:00
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 15:34:04 -05:00
Chris Galvan 04a00e6a54 Resolved latest merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 13:29:55 -05:00
Chris Galvan 8e86623ee6 Fixed compile issue from merge error 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 13:13:17 -05:00