birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,986 Commits 3 Branches 3 Tags
171ff477976ef052d6c520a8ff9117efc897917f
Commit Graph

3986 Commits

This Branch
This Branch
All Branches
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
SJ d5490ecf69 Update AWS android package version to rev4 
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
 2021-06-22 09:39: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
jjjoness 0aad6ad08d Merge pull request #1477 from aws-lumberyard-dev/LYN-2509b 
Cherry picked from development
 2021-06-22 14:46:18 +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
Terry Michaels 858dee2210 Need to keep full asset paths around in LuaIDE (#1470) 2021-06-22 07:05:42 -05: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
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 2021-06-22 11:25:53 +01:00
greerdv 602baa44d9 Merge pull request #1463 from aws-lumberyard-dev/non-uniform-scale-migration 
add editor python script to help with migrating levels with non-unifo…
 2021-06-22 10:49:55 +01:00
jjjoness 1ec238685d Merge branch 'stabilization/2106' into LYN-2509b 2021-06-22 10:07:28 +01:00
John Jones-Steele 2dce6954a1 Cherry picked from development 2021-06-22 09:41:48 +01:00
sphrose 4d02e0b8bb Merge pull request #1454 from aws-lumberyard-dev/LYN-3619 
New level dialog has no way to select a different folder
 2021-06-22 09:15:08 +01: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
jromnoa 2020ad7f64 Merge pull request #1442 from aws-lumberyard-dev/Atom/jromnoa/ATOM-15424-add-some-gpu-tests-to-AutomatedTesting 
ATOM-15424: Adds GPU tests to the nightly o3de runs for the AutomatedTesting project (Windows only)
 2021-06-21 18:05:39 -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
puvvadar 4d0d97b3fe Remove excessive assert 2021-06-21 16:52:05 -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
Danilo Aimini a0f4f16b98 Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 2021-06-21 15:47:25 -07:00
Esteban Papp 9720984c61 SPEC-7437 Launcher_Windows.cpp failing to compile 2021-06-21 15:39:13 -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
greerdv 17908a277a Merge branch 'stabilization/2106' into non-uniform-scale-migration 2021-06-21 22:29:35 +01:00
greerdv b69b6af305 add copyright notice 2021-06-21 22:28:50 +01:00
Terry Michaels ca76a4d1ab Moved helpers to the top level menu bar above viewport (#1464) 2021-06-21 16:11:50 -05: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
amzn-mike a963cd3ac8 Merge pull request #1382 from aws-lumberyard-dev/Helios_TransformImporterFixV2_stabilization_2106 
AssImp: Transform Importer Fix V2
 2021-06-21 15:46:10 -05:00
greerdv 40a84c3c74 add editor python script to help with migrating levels with non-uniform scale 2021-06-21 20:09:48 +01: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
Terry Michaels 74bb2737ca Replaced menu icon in secondary toolbar (#1459) 2021-06-21 12:50:26 -05:00
amzn-mike 514cfc3b4c Fix compile error 2021-06-21 12:27:13 -05:00
sconel e357dea06c Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix 
Spawnable/game mode load error fix
 2021-06-21 09:57:44 -07:00
amzn-mike 40ed743ca9 Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 11:50:17 -05:00