birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,791 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dbc5d7a8bc'
${ noResults }
Commit Graph

8791 Commits (dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9)
 

Author SHA1 Message Date
mbalfour 865dcf6e47 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
shiranj d399d0d8f1 Move jenkins_pipeline_metrics.py to ascripts/build/Jenkins/tools 5 years ago
Alex Peterson 7b3b1cd73e
Merge pull request #27 from aws-lumberyard-dev/remove-expired-data 
Removing expired installer data
 5 years ago
alexpete a3a0f157bd Removing expired installer data 5 years ago
shiranj f3d0666a63 Add retry to get request 5 years ago
shiranj 78cadfd1d0 Convert daily metrics pipeline script to use BlueOcean API 5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
mbalfour 51abef5071 Merge branch 'main' into mbalfour/spec-6178 5 years ago
mbalfour 4c4274ef84 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
mbalfour 0f841656e3 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets. 
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById

This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.

As a bonus, this also removes the blocking load call.  The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
 5 years ago
moudgils 16ba08c917 Mac compile fixes, Fix imgui rendering, Introduce a new RHI::BufferBindFlag, Fix a crash in AsyncStreaming, Fix shader build errors 5 years ago
Alex Peterson 7b165cd40d
Merge pull request #5 from aws-lumberyard-dev/github/staging 
Integrating github/staging through commit b0dd7ed50
 5 years ago
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
alexpete 60e6f204d2 Cherrypicking AWS fixes from f57af843 
This fix brings in a new 3rdparty revision for AWS that fixes a minor dependency issue on Android
 5 years ago
sphrose a71a5746cc [LY-113714] 
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
 5 years ago
alexpete 5e08ec2fa8 Merge branch 'github/staging' of https://github.com/aws-lumberyard-dev/o3de into github/staging 5 years ago
alexpete fba71c0ca4 Removing epb_sanity_smoke_no_gpu_test 5 years ago
pereslav b68d07ff88 Deleted temp test file 5 years ago
jackalbe 442e15a414 Merge branch 'main' into sceneapi_script_autotest 5 years ago
pereslav eb6d586a92 Test file. Will be deleted 5 years ago
hultonha 063b8a6d54 update some reinterpret_cast calls to static_cast 5 years ago
hultonha 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) 5 years ago
greerdv 2313471ab9 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 5 years ago
greerdv 87a3dfc968 fixing bug in editor bodies for rigid bodies with non-uniformly scaled asset colliders with position offsets 5 years ago
greerdv a99786fe59 fixing bug with visibility aabb for non-uniformly scaled polygon prism at activation 5 years ago
mcgarrah ea7b8309b5 Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter 5 years ago
AMZN-mnaumov 1a7bf94917
Merge branch 'main' into Atom/mnaumov/ATOM-14904_2 5 years ago
Nicholas Van Sickle 5de3ff4c61
Merge pull request #7 from aws-lumberyard-dev/nvsickle/EditorViewportWidgetFixes 
Fix several EditorViewportWidget bugs
 5 years ago
nvsickle 2f117c553d Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes 5 years ago
mnaumov f188e1c9a7 Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets 5 years ago
greerdv 106d14cf57
Merge branch 'main' into limit_max_scale 5 years ago
jackalbe 9d1a705fab Merge branch 'main' into sceneapi_script_autotest 5 years ago
Aaron Ruiz Mora 9f88698c3a
Merge pull request #19 from aws-lumberyard-dev/LatestDevMain 
Merging the latest from aws-lumberyad-dev:main to aws-lumberyard:main so dev's main is not ahead of the source of truth.
 5 years ago
greerdv 8e9851d8ea
Merge branch 'main' into limit_max_scale 5 years ago
mbalfour a7aa6a9747 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
AMZN-mnaumov 51a1b19730
Merge branch 'main' into Atom/mnaumov/ATOM-14904 5 years ago
jackalbe 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest 5 years ago
jackalbe 2f1d13e9c1 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
Nicholas Van Sickle 22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes 5 years ago
moraaar cb2ee625be Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
Alex Peterson 73e5a3693f Fixing missing execute permissions 5 years ago
Shirang Jia a25f5b1317
Merge pull request #10 from aws-lumberyard-dev/SPEC-6230 
Pipeline fails when using a new empty ebs volume
 5 years ago
jackalbe 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty 
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename

Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
 5 years ago
luissemp 724105a4ef Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main 5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
alexpete b8e508c2ee Cherrypicking MeshCompiler fix 5 years ago
mbalfour 62330d8386 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
jackalbe 90bcfb4c2e
Merge pull request #1 from aws-lumberyard-dev/jackalbe_scene_api_tests 
fake commit
 5 years ago
Ulugbek Adilbekov aa0b54838c
Fix PhysXDebug and PhysXEditor loading order (#14) 
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
 5 years ago