Commit Graph

4006 Commits

Author SHA1 Message Date
Guthrie Adams 05c5fbe85e Merge pull request #1586 from yuriy0/DontBlockMainThreadToLoadTexturePreviews
Editor responsiveness: don't block main thread to load textures from disk
2021-06-25 17:55:13 -05:00
yuriy0 972c640782 Don't give a broken copy constructor to BehaviorContextObject. (#1002)
* Don't give a broken copy constructor to BehaviorContextObject.

This used to be required by the serialization system, now it handles non-copyable and non-moveable types.

* Explicitly delete the copy constructor instead of defaulting, which implicitly deletes it.

Some compilers complain about such an implicit deletion, and we should be explicit about our intent anyways
2021-06-25 17:32:27 -05:00
yuriy0 ba75adbe7a Generate texture thumbnails in a job thread (#1571) 2021-06-25 11:43:16 -05:00
AMZN-puvvadar f41a76b2c7 Merge pull request #1570 from aws-lumberyard-dev/mp_session_destroy_bugfix
Fix order of ops issue in MP Session Termination
2021-06-25 09:21:59 -07:00
Yuriy Toporovskyy 3ac03c3ce3 Don't block main thread to load data from file 2021-06-25 09:36:47 -04:00
Junbo Liang 9216fc88c6 Address the comments on the CDK application (#1560)
[LYN-3649] Address the comments on the CDK application
2021-06-24 14:50:56 -07:00
puvvadar d6629eea2e Fix order of ops issue in MP Session Termination 2021-06-24 13:56:16 -07:00
Vincent Liu 149cb2e2f2 Merge 'gameliftfeature' branch into 'development' branch (#1534) 2021-06-24 09:13:35 -07:00
jjjoness 5ec274d800 Merge pull request #1551 from aws-lumberyard-dev/LY-122268
Entity Outliner - Sort Order options don't show current selection
2021-06-24 15:01:36 +01:00
John Jones-Steele 5279f05403 Entity Outliner - Sort Order options don't show current selection
Also fixes the menus that have checkmark and icon
2021-06-24 11:59:44 +01:00
jromnoa b1601f1002 Merge pull request #1533 from aws-lumberyard-dev/Atom/jromnoa/ATOM-15840-fix-nightly-gpu-test-to-use-correct-calls
ATOM-15840: fixes the nightly Atom GPU test
2021-06-23 18:38:46 -07:00
yuriy0 372660f1bf Bug fix: reset the flag to false after checking that its current value is true (#1515) 2021-06-23 19:23:30 -05:00
galibzon 01b2079790 [ATOM-15801] AZSLc NoMSAA translation needs to initialize the third (#1529)
argument of GetDimensions() to 1

azslc v1.7.23

Signed-off-by: garrieta <garrieta@amazon.com>
2021-06-23 18:08:09 -05:00
AMZN-puvvadar e7990ce6c8 Merge pull request #1524 from aws-lumberyard-dev/mp_session_destroy
Adjust cleanup logic to handle Session events more cohesively
2021-06-23 15:44:37 -07:00
jromnoa 9a22afb4f6 Merge branch 'development' into Atom/jromnoa/ATOM-15840-fix-nightly-gpu-test-to-use-correct-calls 2021-06-23 15:08:17 -07:00
jromnoa 33801ef925 fixes the nightly GPU test 2021-06-23 14:49:18 -07:00
Chris Santora 843cc00c4b Cherrypicked fix for "Failed to find builder dependency" error message.
Cherrypicked fix for "Failed to find builder dependency" error message.

Merge pull request #1507 from aws-lumberyard-dev/santorac/Cherrypick-ATOM-15134-ATOM-15136

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.
- There was also 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 13:03:21 -07:00
puvvadar 632d774d4c Add disconnect type param to Terminate 2021-06-23 11:44:21 -07:00
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 2021-06-23 10:56:22 -07:00
Ken Pruiksma a034500a10 Adding a factor for alpha affecting specular in the standard and enhanced pbr materials (#1474)
* Adding a factor for how much alpha should affect specular to standard and enhanced pbr. Currently blended and tinted transparency always assume that the geometry represents the surface, and the surface may just be transparent like glass. In this model, specular is unnaffected by alpha - perfectly clear glass still reflects light and obeys the Fresnel factor. However alpha may also represent the absence of a surface entirely for mateirals where cut-out alpha is a bad fit because of subpixel detail, like hair or cob webs. This change addresses that by allowing the alpha to also affect specular reflection if desired.

* Adding material for ASV test.
2021-06-23 12:27:19 -05:00
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