birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
194 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 'f938fde4b0'
${ noResults }
Commit Graph

194 Commits (f938fde4b0f7549c4975cf5c6ebf95e77e89de8c)
 

Author SHA1 Message Date
luissemp f938fde4b0 Compile fix 5 years ago
luissemp f5791ee60a Fixed compile error and added Setters to Node Palette 5 years ago
luissemp 53e84b3820 Fixed scoping rules for variables 5 years ago
luissemp fbe1b53617 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main 5 years ago
Ken Pruiksma 01dc097fa6
Merge pull request #66 from aws-lumberyard-dev/pruiksma/ATOM-15240 
ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists.
 5 years ago
Ulugbek Adilbekov ebebc05cd1
Reenable Blast Automated tests (#42) 
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
 5 years ago
pruiksma 243af5f697 ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists. Adding simple point and simple spot feature processors to the thumbnail scene descriptor. 5 years ago
moudgils 3d3f43b0b9
Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes 
Atom/moudgils/mac runtime fixes
 5 years ago
lumberyard-employee-dm 8019312b35
Merge pull request #28 from aws-lumberyard-dev/LYN-2883 
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
 5 years ago
AMZN-mnaumov c97dae47b7
Merge pull request #22 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904_2 
[ATOM-14904] Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
 5 years ago
Esteban Papp 8b265d2e8d
Initial version that I need to test out (#60) 
LYN-2585 Add cmake/install job to Jenkins
 5 years ago
Brian Herrera be85d2ea58
Merge pull request #57 from aws-lumberyard-dev/build/SPEC-5588 
Prevent skipping build if it's from a pull request
 5 years ago
SJ 03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 
[iOS] Fix build issues
 5 years ago
dmcdiarmid-ly b5386fd53b
Merge pull request #54 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2735 
[LYN-2735] The Editor crashes upon creating a level when the Prefab system has been disabled in a new project
 5 years ago
Nicholas Van Sickle 7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport 
Switch on the Atom-native viewport by default
 5 years ago
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 5 years ago
amzn-sj 7609248c49 Fix build errors 5 years ago
SergeyAMZN 828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline 
Fixed dangling pointer in InitializeCatalog
 5 years ago
Brian Herrera a1f0baeeff Prevent skipping build if it's from a pull request 
Also add safe navigation operator on parameters. This avoids encoutering NullPointerException when accessing build parameters on the first build since these values will be set to null.
 5 years ago
Esteban Papp 4a3d24f189
SPEC-6276 Move ci_build and ci_build_metrics to scripts\build 5 years ago
amzn-sj fff97cda3b Cache runtime dependencies for targets to speed up iOS configuration. 5 years ago
Chris Burel 9c01e993db
Convert etc2comp to new 3p system (#44) 5 years ago
Terry Michaels 78e5a069fa
Removed Cry branding on error messages (#41) 5 years ago
Esteban Papp 2c3a98878f
SPEC-6137 Add a non-unity build for Linux in AR gating runs 5 years ago
Esteban Papp 12088d88a0
SPEC-6275 Remove AutomatedReview folder 5 years ago
Esteban Papp 042241a119
SPEC-6268 Remove check for 3rdParty.txt 5 years ago
AMZN-mnaumov 6541ca4cb0
Merge pull request #18 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904 
[ATOM-14904] Partial fix to Material Editor shutdown
 5 years ago
Esteban Papp 90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 5 years ago
Mike Balfour be0ba6ace9
[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 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
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
nvsickle 97d0f42671 Enable EditorViewportWidget by default 5 years ago
nvsickle bbec18d030 Fix initial camera position when working directly with Atom 5 years ago
Esteban Papp 70c2d5ee40
SPEC-5789 Remove inclusion of CMakeParseArguments 5 years ago
Mike Balfour efe5715e68
Merge branch 'main' into mbalfour/spec-6178 5 years ago
moudgils bd4c813dc6 Merge branch 'main' into Atom/moudgils/MacRuntimeFixes 5 years ago
moudgils 6f67aabd67 Minor cleanup 5 years ago
jackalbe 2961e31f45
Merge pull request #20 from aws-lumberyard-dev/sceneapi_script_autotest 
ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
 5 years ago
jackalbe e8f4fac16a Merge branch 'sceneapi_script_autotest' of https://github.com/aws-lumberyard-dev/o3de into sceneapi_script_autotest 5 years ago
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 5 years ago
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 5 years ago
pereslav 21f861a702 Merge branch 'main' into MultiplayerPipeline 5 years ago
moudgils 9aec30a608 Merge branch 'main' into Atom/moudgils/MacRuntimeFixes 5 years ago
Alex Peterson e4db6829fb
Merge pull request #35 from aws-lumberyard-dev/github/staging 
Integrating github/staging through commit 5f214be
 5 years ago
moudgils 7b6ecc036b Minor updates 5 years ago
moudgils 68d58f48ae Merge branch 'main' into Atom/moudgils/MacRuntimeFixes 5 years ago
mcgarrah 957945f809 Clarified the error message that is output when the project.json is not found 5 years ago
mcgarrah 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path 5 years ago
mcgarrah fa9366b810 Updating the AutomatedTesting project to support being built as an External Project 5 years ago
alexpete 774580cea2 Updating README to mention 3p rev13 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago