Commit Graph

1830 Commits

Author SHA1 Message Date
Chris Santora 171ff47797 Fixed an inderect merge conflict where there was some new code using the AddShaderAssetJobDependency function that I replaced on the stabilization branch. So I updated the new code to use LocateReferencedSourceFile too. 2021-06-23 00:06:40 -07:00
Chris Santora eda64b2d4c Cherrypicked fix for "Failed to find builder dependency" error message.
Cherrypicked b7f6b57e16 from stabilization branch because I knew it would have conflicts I needed to resolve.

See https://github.com/aws-lumberyard/o3de/pull/1462

This removes mostly benign (but noisy) messages about "Failed to find builder dependency".

ATOM-15136 Builder dependency errors reported in mainline
ATOM-15134 Replace GetPossibleDepenencyPaths Approach with Source Dependencies

SrgLayoutBuilder.cpp conflicted because it had been removed on development. The changes in this file are no longer relevant.
ShaderVariantAssetBuilder.cpp conflicted only because there were formatting changes inside the AddShaderAssetJobDependency() function.
2021-06-22 22:20:18 -07:00
Mike Balfour 9aa44a56e7 Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
2021-06-22 15:14:22 -05:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
AMZN-puvvadar 0186911a3a Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
puvvadar 55f5e9f0ae Remove unnecessary forward declare 2021-06-22 09:25:29 -07:00
moudgils 4f84ec90d3 Various new metal fixes (#1465)
* - Fix the second window related tabbing issue
- Merge calls to UseResoources acrooaa all the SRGs
- Move SamplerCache to the device to ensure only one cache to reduce duplication
- Fixes to compute threading numbers getting reset to 0,0,0
- Cleanup withing BufferPoolResolver
- Argument buffers are now queued to be cleaned up upon shutdown
2021-06-22 08:58:15 -07:00
amzn-sean c1b6bb122e fix physics mac nightly build (#1480) 2021-06-22 15:36:30 +01:00
Benjamin Jillich 7d5a7b47ac [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities (#1392)
* [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities
* Added another operation to the CanSpawnEntityForProduct that checks the other products and can veto the creation process.
* The model product will not create an entity in case there is already an actor exported, which prevents the issue reported by two different teams/users.
2021-06-22 14:12:42 +02:00
Tom Hulton-Harrop dc343e2b65 Small camera updates (#1460, LYN-2315)
* add interpolation for goto position/orientation

* resize default camera look-at point
2021-06-22 12:53:20 +01:00
Olex Lozitskiy 706cf0e9c3 sig/network - Fixes EntityReplicationManager::UpdateWindow logic
Corrects ReplicationSet to be an ordered map
2021-06-22 06:09:16 -05:00
dmcdiarmid-ly d94acff6cc Merge pull request #1450 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-5702
[ATOM-5702] MSAA sample is missing lighting when viewing the non-MSAA mode
2021-06-21 21:08:17 -07:00
Doug McDiarmid cd173905a8 Added comment. 2021-06-21 20:20:31 -07:00
AMZN-mnaumov 759d719a44 Merge pull request #1471 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15292
[ATOM-15292] Camera no longer resets when typing something
2021-06-21 18:53:52 -07:00
Esteban Papp bfd266db8f LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch (#1446)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file

* fixing lrelease patching in mac/windows

* reverting change and disabling warning, the intention of the test is to compare to unitialized values

* Fix for dxc

* no need to disable the warning, just remove the const

* missing dependency to EditorCommon
2021-06-21 18:24:29 -07:00
AMZN-Olex ece1187683 Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-21 20:28:43 -04:00
mnaumov 5a276b11b0 Fixing includes 2021-06-21 16:56:06 -07:00
mnaumov 4de1d90994 [ATOM-15292] Camera no longer resets when typing something 2021-06-21 16:52:05 -07:00
AMZN-mnaumov 25a8dc4146 Merge pull request #1469 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14412
[ATOM-14412] Fixing PDO offset tooltip
2021-06-21 16:50:51 -07:00
Cynthia Lin 4d9957d0c4 [ATOM-15781] Add statistics for individual passes. 2021-06-21 16:27:15 -07:00
Doug McDiarmid e769219bac Merge branch 'development' into Atom/dmcdiar/ATOM-5702
# Conflicts:
#	Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
#	Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
2021-06-21 15:26:20 -07:00
mnaumov ac7ec103c8 Fixing PDO offset tooltip 2021-06-21 15:20:22 -07:00
yuriy0 704c127e34 If there are too many wrinkle masks, discard the lowest weight ones (#988)
Since the shader supports a fixed maximum number of active wrinkle masks, if the number of active wrinkle masks is larger than that, it will crash where wrinkleMaskObjectSrg->SetImageArray is called with an array_view which is larger than the target image array.

We need a sensible method of truncating the number of masks. One such method is to discard the lowest weight masks.
2021-06-21 15:19:23 -07:00
puvvadar f2bc80d103 Remove obvious comment 2021-06-21 14:53:19 -07:00
puvvadar f49e5cf645 Validate some base cases in InitializeMultiplayer 2021-06-21 14:49:49 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
cgalvan 46f8c7c1ba [LYN-3412] Updated LandscapeCanvas component to properly serialize with prefabs. (#1224)
* [LYN-3412] Updated LandscapeCanvas component to properly serialize with prefabs.

* [LYN-3412] Updated PR with feedback.

* [LYN-3412] Reverted unintentional changes.

* [LYN-3412] Removed one more comment.

* [LYN-3412] Additional PR feedback fixed.
2021-06-21 14:03:49 -07:00
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 2021-06-21 11:46:16 -07:00
Nicholas Van Sickle b032177418 Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18
Merge stabilization/2106 into development
2021-06-21 10:58:07 -07:00
jjjoness 3549205d29 Merge pull request #1458 from aws-lumberyard-dev/LYN-4195b
LYN-4195b - UX - main menu updates - prevent hover effect on the top level menu icon, dim the link icon and increase space between text and icon throughout.
2021-06-21 17:20:33 +01:00
Eric Phister 22ff37ecda Fixes issue with ACE displaying only banks (#1427)
Updates to some AzCore functions a while ago made some path functions
strip off a trailing slash, which caused bad paths to be used when
loading middleware data.  Updated the code to use better path APIs.
2021-06-21 11:18:03 -05:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
amzn-sean 9f934a6f63 add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 2021-06-21 16:25:45 +01:00
John Jones-Steele 5e4f021d55 Cherry picked from development 2021-06-21 15:28:41 +01:00
Doug McDiarmid 5137a8aec5 Added a new MSAAResolveFullScreenPass which will disable itself in non-MSAA pipelines.
Changed MSAAResolvePass to disable itself in non-MSAA pipelines.
2021-06-21 02:45:59 -07:00
Doug McDiarmid 4730102898 Updated comment. 2021-06-21 01:07:25 -07:00
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 2021-06-20 20:51:59 -07:00
Doug McDiarmid ada63089b5 Changed FullScreenTrianglePass::FrameBegin to use FramePrepareParams viewport and scissor states if they are set.
Changed ReflectionScreenSpaceBlurChildPass to set the viewport and scissor states.
2021-06-19 01:30:36 -07:00
nvsickle dc3d1dc010 Restore connections in ShaderVariant::Init 2021-06-18 22:03:39 -07:00
Doug McDiarmid 72e5ab4437 Merge branch 'development' into Atom/dmcdiar/ATOM-5702 2021-06-18 17:12:52 -07:00
Doug McDiarmid dc1d34c83f NoMSAA supervariant support
Added a ShaderSystem supervariant to provide a system-wide supervariant name.
Changed ShaderAsset to append the system-wide supervariant name when searching for supervariants.
Added the NoMSAA supervariant to several shaders.
2021-06-18 16:39:32 -07:00
amzn-hdoke 556d607a5e Make AWSCore.Editor tests windows only (#1410) 2021-06-18 16:30:49 -07:00
Steve Pham f91ba1a80b Minor pre-license update cleanup of files (#1437)
- Remove legacy CryEngine.tip file
- Remove legacy WAF files
- Renamed Lumberyard to O3DE
- Updating "Amazon.com" to "Open 3D Foundation"
2021-06-18 16:09:18 -07:00
Stephen Tramer b78fa5eed4 Merge pull request #1372 from aws-lumberyard-dev/stramer/az-networking-docs
Networking libraries + Gems API documentation
2021-06-18 15:53:42 -07:00
AMZN-mnaumov 8459855395 Merge pull request #1428 from aws-lumberyard-dev/Atom/mnaumov/LYN-4253
[LYN-4253] Improving Editor performance while thumbnails are rendering
2021-06-18 15:34:39 -07:00
nvsickle 6f244474b5 Remove double Shader init call 2021-06-18 14:50:55 -07:00
Chris Burel cbeafe29d3 Avoid serializing size_t in EMotionFX code (#1423)
`size_t` is a typedef that is sized differently on different platforms.
Instead, use `AZ::u64`, which is large enough to hold all platforms'
`size_t` types but is a fixed size, to avoid size mismatches per
platform.
2021-06-18 14:14:42 -07:00
nvsickle ea3adc8405 Fix several merge conflicts and auto-formatting issues 2021-06-18 13:41:59 -07:00
hershey5045 c127a044d4 Enable fog in physical sky component to blend with deferred fog (#1320) 2021-06-18 13:39:11 -07:00
Aaron Ruiz Mora 1ad6264d0d Using newer version of NvCloth 3rdParty (#1435) 2021-06-18 21:37:15 +01:00