Commit Graph

7764 Commits (cff2315654a016d5c1e8a40f0fc3e55f957dd3af)
 

Author SHA1 Message Date
greerdv cff2315654 small correction to wording
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 4d6fa26681 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv ec10bb078e improve wording for all PhysX gem tooltips apart from pipeline, fixes 3898
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
Chris Burel 5967b419a2
Only enable the Keyboard device in the XcbKeyboard unit tests (#4682)
This prevents other input devices from interfering with the expected calls
that the Keyboard tests should make.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
jromnoa 922a991443
change expected_lines to something that appears in both AR + locally (#4680)
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
Vincent Liu 6823ea2274
Add GameLift matchmaking backfill server support (#4622)
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
lumberyard-employee-dm 2474ffc5a1
Fixed contains check in the Global AnimNode Map macros (#4674)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Ken Pruiksma 937c2b2e88
Terrain FP supports macro material component (#4587)
* Adding basic support for TerrainMacroMaterialNotificationBus. Tracking macro materials in list.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit b4773454334de940d730620ffff300b46d6c611d)

* Adding bus connection

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 66c99f503adb24f4be4f81716b544202d8e237d9)

* Additions to indexed data vector to allow for getting an index from the data or deleting data with a reference to the data itself instead of the index.
Additions to the feature processor for tracking macro material indices in sectors.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 06365dbde5454e18e5fdf941f03b17b0d632027c)

* Macro materials updating which macro materials are used in which sectors. Correctly handling construction / destruction.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating the terrain macro material type to have the correct properties and also not attempt to render. Refactored some of the update loop in the TerrainFP to only rebuild the sectors when necessary, otherwise just update the srgs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed up macro material to not try to actually render anything with shaders or hook to any shader data
Terrain FP now pulls data pulling from macro material instance to use in the terrain material
Various bug fixes around when terrain sectors needed reprocessing

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding basic support for TerrainMacroMaterialNotificationBus. Tracking macro materials in list.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit b4773454334de940d730620ffff300b46d6c611d)

* Adding bus connection

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 66c99f503adb24f4be4f81716b544202d8e237d9)

* Additions to indexed data vector to allow for getting an index from the data or deleting data with a reference to the data itself instead of the index.
Additions to the feature processor for tracking macro material indices in sectors.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 06365dbde5454e18e5fdf941f03b17b0d632027c)

* Macro materials updating which macro materials are used in which sectors. Correctly handling construction / destruction.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating the terrain macro material type to have the correct properties and also not attempt to render. Refactored some of the update loop in the TerrainFP to only rebuild the sectors when necessary, otherwise just update the srgs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed up macro material to not try to actually render anything with shaders or hook to any shader data
Terrain FP now pulls data pulling from macro material instance to use in the terrain material
Various bug fixes around when terrain sectors needed reprocessing

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Constify all the things

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updates from PR review.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
4 years ago
Brian Herrera b4c9f20fb9
Add step to verify drive is in an offline state (#4668) 4 years ago
Sean Sweeney bdbc2eabff
Merge pull request #4671 from aws-lumberyard-dev/ap_fix
Stabilize asset processor immediately exiting
4 years ago
amzn-phist 80dcc34e6f
Add "Registry" folders as scan folders (#4583)
* Add "Registry" folders as scan folders

For projects, Gems, and Engine, add the "Registry" folder as scan
folders.

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

* Change params for adding scan folder

Also add trailing newlines to setreg files.

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

* Adjust the priority order for project templates

Scan folder orders were way too high, they should be very low to become
highest priority order.

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

* Removes change of default assets folder to Assets

Need to revert this change so it can be done separately.
Renamed the scan folder to 'Project/Assets' to prep for Assets folder
change later on.

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

* Update platform configuration test to pass

Adjusted expectation of scan folder count from 1 to 2 per Gem for
'Assets' and 'Registry' now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Guthrie Adams 0217f45f3f
Merge pull request #4673 from aws-lumberyard-dev/Atom/guthadam/update_material_editor_icons
updated material editor skybox and changed property icons
4 years ago
Danilo Aimini f7e2d07a4b
LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. (#4620)
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.

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

* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.

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

* Minor code adjustments

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

* Minor fixes and optimizations

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
sweeneys 2b7262f566 Mock additional popen calls
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
brianherrera b792ff3d33
Fix command formatting
Signed-off-by: brianherrera <briher@amazon.com>
4 years ago
Nicholas Lawson 5ba30f9a37
Update tiff to the new package revision (fixes IOS TIFF package) (#4638)
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
4 years ago
brianherrera 4625e6d315
Fix indentation
Signed-off-by: brianherrera <briher@amazon.com>
4 years ago
Danilo Aimini 3c3cde99be
LYN-7189 | Outliner - Disable context menu if right clicking on disabled entity (#4651)
* Don't allow right clicking on a non selectable entity in the Outliner

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

* Also check that the index is valid to still allow the right click context menu to appear on empty areas of the widget.

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

* Change if check to a more readable bool.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
allisaurus 3934ac24e0
Add field titles, tooltips to AWSClientAuth AWSCognitoUserManagementRequestBus nodes (#4613)
Signed-off-by: Stanko <stankoa@amazon.com>
4 years ago
amzn-phist 29b62c7b84
Various updates to get pak builds working (#4552)
* Various updates to get pak builds working

-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.

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

* Reverting a change that caused some test failures.

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

* Change tabs to spaces

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
amzn-mike e7d7720d02
Procedural Prefabs: Don't activate prefab when saving to manifest (#4663)
* Generate prefab group dom without activating prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix bad merge

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
AMZN-nggieber 10ab1a369f
Adds Download status info UI to Gem Catalog (#4602)
* Adds Download status info UI to Gem Catalog

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

* Removed test code

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

* Remove unused variable

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

* Addressed PR feedback

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

* Fixed Open3DEngine spelling

Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Danilo Aimini da3a39a6a0
LYN-7121 | Focus Mode - Make editing a prefab an undoable operation (#4582)
* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.

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

* Fix selection code to avoid warning message

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

* Removed changed property from PrefabFocusUndo node

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

* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged

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

* condense if check on Prefab Edit context menu item setup

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

* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)

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

* Remove rej file that was included by mistake

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

* Fix missing interface initialization in PrefabFocusTests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
sweeneys f1fa0acbb4 Stabilize asset processor immediately exiting
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
Guthrie Adams afdf35a925 updated material editor skybox and changed property icons
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Junbo Liang 26d53690b9
[GameLift][FlexMatch] Add client side change for match acceptance (#4634)
* [GameLift][FlexMatch] Add client side change for match acceptance required

Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
brianherrera 3c7357da47
Update existing unmount step to use new offline function
Signed-off-by: brianherrera <briher@amazon.com>
4 years ago
brianherrera ac8201a2fa
Update disk setup step to use context manager
Signed-off-by: brianherrera <briher@amazon.com>
4 years ago
brianherrera 56f0ea68a6
Add step to verify disk is in an offline state
Some Windows configs will automatically set new drives as online causing diskpart setup script to fail.

Signed-off-by: brianherrera <briher@amazon.com>
4 years ago
jromnoa 150060441e
Re-add pytest.mark.test_case_id markers (#4621)
* add some test case id markers

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

* re-added pytest.mark.test_case_id markers for test cases

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

* re-add directional light log lines that were missing and re-add directional light test case id

Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
Benjamin Jillich b6a1f62dec
EMotion FX: Fix for broken workspaces after asset path change (#4662)
Some days ago an impactful change deprecated @assets@ and @root@ keywords from paths which our workspaces used. Some workspaces used these and were broken. This change makes them backward compatible and loads the assets correctly again. It also auto fixes broken paths that were present in some of the saved workspaces + making sure new workspaces are saved correctly.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
lumberyard-employee-dm 97e9f4dc7d
[LYN-6838] Various Monolithic shutdown fixes for the GameLauncher (#4564)
* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.

This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator

Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.

This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available

Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance

Updated the EnvironmentVariable instance to store the NameDictionary as a
value.

Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang 6.0.0 build fixes

The C++17 std::launder feature isn't available in that compiler version

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Adi Bar-Lev 3af07e5117
Hair - creating parent class for raster pass as prep for ShortCut technique (#4560)
Signed-off-by: Adi-Amazon <barlev@amazon.com>
4 years ago
amzn-sean 5bf7330f35
made some physX tests less flaky (#4632)
Joints_BallLeadFollowerCollide - changed the idle_wait to a wait_for_condition of the lead and follower colliding with a 10 second timeout. It was a 2 second timeout which is on the edge of the time from start to collision (~1.5sec).

Joints_HingeNoLimitsConstrained - now measures the angle the joint is at and waits for the follower to raise up and over the lead, or fail after a 10sec timeout. This use to 'catch' the follower joint in a force region and check the position of the follower to determine pass/fail.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
hultonha 48a74ca93d
Remove clearFocus from EditorTransformComponentSelection duplicate Entity (#4571)
* remove clearFocus from EditorTransformComponentSelection duplicate entity

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

* remove extra unneeded calls to RequestWrite

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

* update PrefabPublicHandler to use SetSelectedEntities

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Benjamin Jillich da1fde8314
ImGui histogram container improvements (#4630)
* Added auto scale mode that uses a running average to expand and shrink the visible vertical range.
* Added option to set the move direction and either push new values to the front of the buffer (left) and make the histogram move to the right or the inverse.
* Changed the camera monitor to use auto scaling as well as the current one was not showing anything because of an outlier.
* Pre-fill the histogram with zeros so that the first pushed sample moves in without horizontal scaling effects which made it hard to read out any information from the histogram.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Benjamin Jillich 2b79abb8c4
EMotion FX: A parameter’s text box of Blend Space 2D and 1D Motions only takes one numerical input value including fractions (#4626)
The on value changed event was recevied too often - with every newly typed character. As we're updating elements outside of the value spinbox, we need to wait for the actual done editing signal. This can be achieved by not tracking the keyboard for the spinbox.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Steve Pham ccd60513f1
Fix prefab close dialog Editor crash on Linux (#4623)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Danilo Aimini 1cb26a31f8
LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers for entities out of focus + selection shortcut adjustments (#4615)
* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.

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

* When Escape is pressed, clear the Prefab Focus.

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

* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.

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

* Remove redundant comments and reduce footprint of tests.

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

* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Luis Sempé 3b78132833
Split StyleHelper.h into a header and source file (#4614)
* Split StyleHelper.h into a header and source file

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing file from commit

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed incorrect path

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Fixed includes

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed unnecessary comment

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing include

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Guthrie Adams 2b72f7b100
Merge pull request #4642 from aws-lumberyard-dev/Atom/guthadam/overriding_property_asset_ctrl_thumbnails
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail image
4 years ago
Sean Sweeney 1ea472bdeb
Merge pull request #4589 from aws-lumberyard-dev/lytt_integ_linux
Platform manager and sanity tests for Linux
4 years ago
Steve Pham 70636572ff
Fix casing of editor_xml filenames to match casing in .ly files (#4640)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Artur K 80db67e90a
Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove a few more dead config vars

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Guthrie Adams f34811c373
Merge pull request #4639 from aws-lumberyard-dev/Atom/guthadam/thumbnail_bus_passes_const_qpixmap
Updated thumbnail notification bus to use const QPixmap&
4 years ago
Guthrie Adams 4f539b0eb7 fixed comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Sean Sweeney 960e3fc1b9
Merge pull request #4427 from aws-lumberyard-dev/sample_editor_for_qa_automation
Sample Editor test for QA Automation project
4 years ago
Guthrie Adams f7e08d1c4b PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail images
• PropertyAssetCtrl was previously extended with ThumbnailPropertyCtrl to optionally display a thumbnail and floating zoomed in preview of the selected asset.
• This change allows overriding the image that comes from the thumbnail system with a custom image provided as an attribute. The custom image can be specified as either a file path or a buffer containing a serialized QPixmap.
• This will be used by the material system in the editor to provide a dynamically rendered image of the material with property overrides applied so that the image will update as the user customizes their material.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Danilo Aimini 6318247b3d
LYN-7279 + LYN-7192 | Focus Mode - Container unit tests + Clear container entity open state on new level load (#4558)
* Change SetContainerOpenState to SetContainerOpen.

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

* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.

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

* Minor FocusMode fixture refactors to support ContainerEntity tests

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

* Introduce tests for the ContainerEntity API

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

* Add include to fix issue with EntityContextId not being defined.

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

* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.

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

* Use default editor context id in ContainerEntitySystemComponent

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

* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
mrieggeramzn c38c9739da
Adding vertexNormal to the Surface structure and using it for shadows (#4617)
* Adding vertex shadow and using it for all shadows
* Fixing small issue with it not being initialized
* Adis recommendations for hair

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago