birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,702 Commits 3 Branches 3 Tags
bb4fdc8fe86c674fe02429832843bbf95e116a67
Commit Graph

2128 Commits

Author SHA1 Message Date
nvsickle 049ef81fe9 Address some review feedback, fix license 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:07 -07:00
nvsickle 52ae7433b3 Use synthetic keyboard and mouse devices instead of synthetic input channels 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:06 -07:00
nvsickle 8dc59a13da Revert "Add InputChannel API to disable forwarding events to the underyling device" 
This reverts commit c4be5021116fd7f4944ac300056031b7d5be25be.

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:04 -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
nvsickle f4c96fc9df -Rework input handling to filter through a global event filter 
-Attempt to support remote desktop for viewport cursor capture

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:00 -07:00
nvsickle 15248e7c12 Add QtEventToAzInputManager 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:57 -07:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911) 
* fix for [LYN-4828], message box style changes

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

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-07 13:49:55 -07:00
nvsickle 8e51a4763f Add InputChannel API to disable forwarding events to the underyling device 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:55 -07:00
Jose e18bcc63f2 Fixed a bug in the ReflectedPropertyError that was preventing groups from opening correctly 
Signed-off-by: Jose <jotamkin@amazon.com>
 2021-07-07 15:30:58 -05:00
Jose 0502475fa6 Created a toggle switch to enable and disable groups through the EditContext 
Signed-off-by: Jose <jotamkin@amazon.com>
 2021-07-07 14:09:26 -05:00
nvsickle 2fefa80937 Use AZ::DynamicModuleHandle 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:18 -07:00
nvsickle 21dbe8b48f Address review feedback 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:16 -07:00
nvsickle 0c97888d0f Revert accidental change 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:13 -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
kberg-amzn bd5226aac5 Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-07-07 10:41:44 -07:00
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:58:41 -05:00
hultonha ab354f2e9b Merge pull request #1903 from aws-lumberyard-dev/hultonha_SPEC-7644_disable-ParallelDeepAssetReferences 
Disable ParallelDeepAssetReferences test until sporadic failures are root caused
 2021-07-07 16:52:40 +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
hultonha fe9c9f66f1 disable ParallelDeepAssetReferences test 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 15:05:17 +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
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
Chris Galvan 77cc0e921c Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-06 10:15:32 -05:00
amzn-sean 636ff587c3 Shape casts correctly report positions of colliders that intersect or in contact of the initial pose (#1848) 
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-07-05 18:06:20 +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
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
Sandeep 4c684b1a10 Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs 
Initial prefab integration
 2021-07-02 14:05:25 -07: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
SergeyAMZN 0a957fb03a Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2 
LYN-4866 Fixed net entities indices when creating net spawnable
 2021-07-02 21:31:42 +01: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 d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
Tom Hulton-Harrop dafe9f6690 Add customization point for begin/end of camera behaviors (hide cursor with RMB look) (#1758) 
* add customization points for begin/end of camera input to all cursor customization

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

* remove cursor experiments, use cursor bus

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

* run clang-format

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

* add additional unit tests for new camera behaviors

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

* update test name to use snake_case to increase readability

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-02 18:17:44 +01:00
pereslav 436d9734d2 Fixed clang build error 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-07-02 18:06:39 +01:00
Danilo Aimini 3c959832a3 Reparenting - introduce loop detection on instance reparenting (DCO fix) (#1752) 
* Detect loops in reparenting code and assert.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add warning when detecting a cyclical dependancy. Revert reparenting on loop.

Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use GetActiveWindow helper to handle window edge cases

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-02 08:24:58 -07:00
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-07-02 16:01:30 +01:00
igarri 8b016f86a6 Adressing Code review comments 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 13:38:35 +01:00
Terry Michaels f93c2f5b60 signoff (#1748) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-07-02 07:08:12 -05:00
igarri e9f44863a4 Fixed BuildMap method 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:36:15 +01:00
igarri b0ddd93824 Code cleanup and review changes 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:35:49 +01:00
igarri a07445c2da Cleanup and removed optimize 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:35:28 +01:00
igarri 514f9ef6c2 Adjusted parameters 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:35:13 +01:00
igarri c061802ab0 Retrieving data from preferences 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:35:00 +01:00
igarri 5d6ab2699c First Performance pass 
Signed-off-by: igarri <igarri@amazon.com>
 2021-07-02 11:34:38 +01:00
Danilo Aimini 02f340abbd Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-01 18:37:44 -07:00
Terry Michaels b331eea9ca Removed the AmazonStyle executable and files as they are old/invalid (#1733) 
* signoff

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-07-01 19:25:08 -05:00
srikappa-amzn 37a899f5e1 Merge pull request #1709 from aws-lumberyard-dev/Prefab/DisableDestroyGameEntity 
Disable support to destroy game entities through behavior context when prefabs are enabled
 2021-07-01 16:31:04 -07:00
alexmontAmazon 9ef25cb5c4 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) (#1726) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

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

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-01 13:59:10 -07:00