Commit Graph

4014 Commits (7b618d9db2fbdf44a4ab5bb0f63c29613a4c247d)
 

Author SHA1 Message Date
Alex Peterson 7b618d9db2
Updating LFS config to new endpoint (#1623)
Signed-off-by: AMZN-alexpete
5 years ago
jonawals 8d2c0009fe
Merge pull request #1559 from aws-lumberyard-dev/jonawals_LYN-4667_FindWhichSnapshotToUse
Add snapshot selection to PR and non-PR builds.
5 years ago
Guthrie Adams 2b2a469a88
Merge pull request #1588 from yuriy0/EditorPerfSaveCallToAPInImagePreview
Editor performance: avoid un-needed main thread work
5 years ago
Guthrie Adams 05c5fbe85e
Merge pull request #1586 from yuriy0/DontBlockMainThreadToLoadTexturePreviews
Editor responsiveness: don't block main thread to load textures from disk
5 years ago
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
5 years ago
yuriy0 ba75adbe7a
Generate texture thumbnails in a job thread (#1571) 5 years ago
AMZN-puvvadar f41a76b2c7
Merge pull request #1570 from aws-lumberyard-dev/mp_session_destroy_bugfix
Fix order of ops issue in MP Session Termination
5 years ago
Yuriy Toporovskyy ad2ee47ea3 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 5 years ago
Yuriy Toporovskyy 3ac03c3ce3 Don't block main thread to load data from file 5 years ago
John cfe839e89e Address PR comments 5 years ago
John b34845b496 Merge branch 'development' into jonawals_LYN-4667_FindWhichSnapshotToUse 5 years ago
Junbo Liang 9216fc88c6
Address the comments on the CDK application (#1560)
[LYN-3649] Address the comments on the CDK application
5 years ago
puvvadar d6629eea2e Fix order of ops issue in MP Session Termination 5 years ago
John c831304c8a Address PR comments 5 years ago
John 38f852d8b9 Add snapshot selection to PR and non-PR builds.
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.
5 years ago
Vincent Liu 149cb2e2f2
Merge 'gameliftfeature' branch into 'development' branch (#1534) 5 years ago
jjjoness 5ec274d800
Merge pull request #1551 from aws-lumberyard-dev/LY-122268
Entity Outliner - Sort Order options don't show current selection
5 years ago
John Jones-Steele 5279f05403 Entity Outliner - Sort Order options don't show current selection
Also fixes the menus that have checkmark and icon
5 years ago
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
5 years ago
yuriy0 372660f1bf
Bug fix: reset the flag to false after checking that its current value is true (#1515) 5 years ago
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>
5 years ago
AMZN-puvvadar e7990ce6c8
Merge pull request #1524 from aws-lumberyard-dev/mp_session_destroy
Adjust cleanup logic to handle Session events more cohesively
5 years ago
jromnoa 9a22afb4f6 Merge branch 'development' into Atom/jromnoa/ATOM-15840-fix-nightly-gpu-test-to-use-correct-calls 5 years ago
jromnoa 33801ef925 fixes the nightly GPU test 5 years ago
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.
5 years ago
puvvadar 632d774d4c Add disconnect type param to Terminate 5 years ago
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 5 years ago
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.
5 years ago
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. 5 years ago
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.
5 years ago
Mike Balfour 9aa44a56e7
Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
5 years ago
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
5 years ago
AMZN-puvvadar 0186911a3a
Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
5 years ago
SJ d5490ecf69
Update AWS android package version to rev4
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
5 years ago
puvvadar 55f5e9f0ae Remove unnecessary forward declare 5 years ago
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
5 years ago
amzn-sean c1b6bb122e
fix physics mac nightly build (#1480) 5 years ago
jjjoness 0aad6ad08d
Merge pull request #1477 from aws-lumberyard-dev/LYN-2509b
Cherry picked from development
5 years ago
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.
5 years ago
Terry Michaels 858dee2210
Need to keep full asset paths around in LuaIDE (#1470) 5 years ago
Tom Hulton-Harrop dc343e2b65
Small camera updates (#1460, LYN-2315)
* add interpolation for goto position/orientation

* resize default camera look-at point
5 years ago
Olex Lozitskiy 706cf0e9c3
sig/network - Fixes EntityReplicationManager::UpdateWindow logic
Corrects ReplicationSet to be an ordered map
5 years ago
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 5 years ago
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…
5 years ago
jjjoness 1ec238685d
Merge branch 'stabilization/2106' into LYN-2509b 5 years ago
John Jones-Steele 2dce6954a1 Cherry picked from development 5 years ago
sphrose 4d02e0b8bb
Merge pull request #1454 from aws-lumberyard-dev/LYN-3619
New level dialog has no way to select a different folder
5 years ago
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
5 years ago
Doug McDiarmid cd173905a8 Added comment. 5 years ago
AMZN-mnaumov 759d719a44
Merge pull request #1471 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15292
[ATOM-15292] Camera no longer resets when typing something
5 years ago