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

67 Commits (4232fa4232cbb71c2302e5de387489fa48e45590)

Author SHA1 Message Date
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
Tom Hulton-Harrop 405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab 
Add Json serialization support for ByteStream

Fixes serialization issue with the White Box component when Prefabs are enabled.
 5 years ago
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901 
Lyn 1901
 5 years ago
amzn-sean 2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp 
SystemComponent is now only built once in the PhysX.Static target
 5 years ago
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 5 years ago
kberg-amzn c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents 
Multiplayer components
 5 years ago
srikappa-amzn 76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs 
Make creation of new prefabs use a relative path to the project
 5 years ago
Terry Michaels 020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes (#73) 
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
 5 years ago
Nicholas Van Sickle 2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix 
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 5 years ago
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago
jjjoness 11081aeddd Changed logo to O3DE 5 years ago
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 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
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 5 years ago
SJ 03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 
[iOS] Fix build issues
 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
Terry Michaels 78e5a069fa
Removed Cry branding on error messages (#41) 5 years ago
Esteban Papp 90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 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
Mike Balfour efe5715e68
Merge branch 'main' into mbalfour/spec-6178 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
hultonha 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
hultonha e1e746066d add some preliminary tests for ByteStreamSerializer 5 years ago
hultonha 2655aaa633 update ByteStreamSerializer to use Base64 encoding 5 years ago
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 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
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
mbalfour d7f10e9d60 [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
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
jackalbe 442e15a414 Merge branch 'main' into sceneapi_script_autotest 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