Commit Graph

4608 Commits

Author SHA1 Message Date
jonawals 06c65be40a Add handling for integrity failures when applying and resolving change lists (#1993)
* ApplyAndResoveChangeList integration failure policy

Signed-off-by: John <jonawals@amazon.com>

* Default integrity failure policy for TIAF sequences

Signed-off-by: John <jonawals@amazon.com>

* Fix superfluous quotation marks

Signed-off-by: John <jonawals@amazon.com>

* Remove superfluous args parse

Signed-off-by: John <jonawals@amazon.com>

* Fix broken storage of last commit hash

Signed-off-by: John <jonawals@amazon.com>
2021-07-08 15:59:05 -05:00
SergeyAMZN d8c4e0160a Merge pull request #1970 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
Fixed crash when non-net entities get activated
2021-07-08 20:56:36 +01:00
bosnichd 0ebd5810e3 Fix "GameLauncher Log is Saved with Wrong File Extension" (LYN-3972). (#1984)
I'm pretty sure that CryString::Format is broken, but it's slated for removal along with the rest of CrySystem, so I'm just addressing the symptom rather than the likely cause (mainly to save time, but also out of an abundance of caution in case other code is inadvertently depending on the existing behaviour of CryString::Format).

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-07-08 13:14:40 -06: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
Jacob Hilliard 08c2796760 [ATOM-15682] Initial CPU Visualizer widget (#1836)
* Visualizer: implement basic performance widget with controls

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: implement basic function statistics

 - Fix floating point bug in drawing logic
 - Implement color picker for regions
 - Aggregate invocations and average time across frames

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: drawing execution time labels

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: fix fstring type errors

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: fix remaining fstring errors

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: implement cursor-relative zooming

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: try to update AR status

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address PR comments + cleanup

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address more PR comments

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address more PR comments

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-07-08 09:52:04 -07:00
mgwynn 82d2fb9244 Adding header to resolve undefined type error (#1938)
Signed-off-by: mgwynn <mgwynn@amazon.com>
2021-07-08 09:26:56 -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
pereslav ffb4a3c432 Fixed crash when non-net entities get activated
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-08 17:07:51 +01:00
Chris Galvan 1a2f83043d Merge pull request #1960 from aws-lumberyard-dev/jckand/ViewMenuTestFix
Updating expected View menu options for test_Menus_ViewMenuOptions_Work
2021-07-08 10:40:15 -05:00
jckand-amzn ea0e38aaf4 Updating expected View menu options for test_Menus_ViewMenuOptions_Work
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-07-08 08:10:09 -05:00
Jeongseok Lee ec026963b8 Create 3rd-party directory if not exists (#1877)
Signed-off-by: Jeongseok Lee <jeoslee@amazon.com>
2021-07-07 18:18:48 -07:00
nvsickle c8fb453760 Fix copyright header copy/paste issue.
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 14:40:59 -07:00
amzn-phist 302fef2ec8 Update Wwise version info in Readme.md (#1910)
* Update Wwise version info in Readme.md

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates to Wwise readme text

Correct capitalization of 'Wwise' and add info about selecting the
SDK(C++) component.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-07-07 16:22:52 -05:00
nvsickle 964b4247f7 Update license header
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 13:50:13 -07:00
nvsickle fa9a12eac3 Forward double click events as well
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 13:50:11 -07: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 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 a4a038cb28 Switch RenderViewportWidget to using Qt events instead of AzFramework input events
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 13:49:58 -07:00
nvsickle 15248e7c12 Add QtEventToAzInputManager
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 13:49:57 -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
Royal OBrien fa1375d7c6 Adding contributing guide pointer markdown (#1928)
Signed-off-by: Royal OBrien <obwando@obwando.com>
2021-07-07 13:49:27 -07:00
Brian Herrera ffdc2d4583 Merge pull request #1932 from aws-lumberyard-dev/ARTemplate
AR template update
2021-07-07 13:48:06 -07:00
mcphedar 93db356fbb Updating templates
Signed-off-by: mcphedar <mcphedar@amazon.com>
2021-07-07 15:39:59 -05:00
mcphedar 210732334e Updating this template with correct labels
Signed-off-by: mcphedar <mcphedar@amazon.com>
2021-07-07 15:36:31 -05: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
Terry Michaels 8ffb25248b Merge pull request #1906 from aws-lumberyard-dev/hultonha/gitflow_210707_o3de
Merge from stabilization/2106 to development (2021/07/07)
2021-07-07 14:12:26 -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 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
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
Benjamin Jillich 2ab2503337 Revert "[MeshOptimizer] Determine the original vertex index based on the position (#1562)" (#1902)
This reverts commit ef1f95f1d0.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-07 14:28:53 +02: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
jonawals a3d14e217e Change TIAF seed criteria. (#1857)
We currently cannot predict when a given snapshot will be taken. This is
problematic as test impact analysis assumes that the coverage data will
be updated after each run. As we have no control over when our coverage
data will persist we will instead always seed when the pipeline and
branch is one of the seeding pipelines, otherwise we will attempt to
read that seed data and perform test impact analysis (if no seed data is
present we will fall back to a regular, uninstrumented run of all test
targets).

This approach has the following implications:

1. PR builds will benefit from test impact analysis as the seed data is
    (hopefully) available at the time the snapshot is created.

2. Builds for the aforementioned seeding branches and pipelines will not
    benefit from test impact analysis and will incur the cost of seeding
    regardless of whether or not that generated seed data ends up in the
    snapshot.

Signed-off-by: John <jonawals@amazon.com>
2021-07-07 11:47:36 +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
SergeyAMZN e9ceee9b32 Merge pull request #1879 from aws-lumberyard-dev/MultiplayerPlayerPrefabBug_LYN-4989
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem…
2021-07-07 10:31:45 +01:00
hultonha 707d153a87 Merge branch 'stabilization/2106' into hultonha/gitflow_210706
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-07 10:30:48 +01:00
Chris Burel ef1f95f1d0 [MeshOptimizer] Determine the original vertex index based on the position (#1562)
* Determine the original vertex index based on the position

The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a filter view instead of reimplementing a filter view

Signed-off-by: Chris Burel <burelc@amazon.com>

* Don't attempt to weld similar vertices if there's blendshapes

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add test for the mesh optimizer's ability to weld nearby vertices

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add logging call to show mesh optimizer effect on vertex count

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a bunch of temporaries in order to make `position` `const`

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-07 11:21:09 +02:00
hultonha dee65914f0 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha/gitflow_210706 2021-07-07 09:23:48 +01:00
lumberyard-employee-dm 8592e4fbbe Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-06 20:42:09 -05:00
pereslav 4a42c32a4b LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-07 00:12:30 +01:00
Brian Herrera 88725210c1 Merge pull request #1875 from brianherrera/add-issue-templates
Add issue templates for bugs and features
2021-07-06 15:17:28 -07:00
brianherrera a014aed03d Add feature request template
Signed-off-by: brianherrera <briher@amazon.com>
2021-07-06 15:09:14 -07:00
brianherrera f8753a609e Add bug issue template
Signed-off-by: brianherrera <briher@amazon.com>
2021-07-06 15:08:39 -07:00