mnaumov
a23a2fba65
PR feedback
5 years ago
puvvadar
d1a65c8dc4
Merge main to Multiplayer Editor branch
5 years ago
puvvadar
fa781fabc5
Add MultiplayerGem Editor components for Ctrl+G support
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
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
mnaumov
28ccb5d381
Fixing camera panning and zooming
5 years ago
nvsickle
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
5 years ago
nvsickle
bbec18d030
Fix initial camera position when working directly with Atom
5 years ago
Mike Balfour
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
5 years ago
moudgils
6f67aabd67
Minor cleanup
5 years ago
greerdv
2fb2813b48
updating atom mesh component to support non-uniform scale component
5 years ago
hultonha
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
moudgils
9aec30a608
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
5 years ago
moudgils
7b6ecc036b
Minor updates
5 years ago
karlberg
ca3df5d6c8
Various bug fixes to get entity replication working
5 years ago
moudgils
68d58f48ae
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
5 years ago
alexpete
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
mnaumov
5050de2604
Adding "Open Material Editor" action to Material Component slot context menu
5 years ago
alexpete
e6c12499f7
Added raytracingscenesrg.srgi to the default project template and AutomatedTesting project.
...
Added assert to check for successful load of the raytracingscenesrg asset.
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
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
921eb742d4
Merge branch 'main' into github/staging
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
AMZN-mnaumov
1a7bf94917
Merge branch 'main' into Atom/mnaumov/ATOM-14904_2
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
AMZN-mnaumov
51a1b19730
Merge branch 'main' into Atom/mnaumov/ATOM-14904
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
cd12226849
Merge branch 'main' into github/staging
5 years ago
Ulugbek Adilbekov
aa0b54838c
Fix PhysXDebug and PhysXEditor loading order ( #14 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
5 years ago
hultonha
5fc4aeaf09
add alias for AZStd::vector<u8> before potential change
5 years ago
mnaumov
0dd57ae901
Adding mutex to ImageProcessingBus
5 years ago
nvsickle
2190787c40
Fix build
5 years ago
jackalbe
d09dc500d3
fake commit
5 years ago
nvsickle
1dabb39b98
Migrate fixes from CodeCommit branch
5 years ago
alexpete
c5b955d281
Integrating github/staging through commit b0dd7ed
5 years ago
alexpete
1044dc3da1
Integrating github/staging through commit ab87ed9
5 years ago
alexpete
c2cbd430fe
Integrating up through commit 90f050496
5 years ago
Brian Herrera
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
5 years ago
alexpete
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
Brian Herrera
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
5 years ago
alexpete
75dc720198
Integrating latest 47acbe8
5 years ago
alexpete
a10351f38d
Initial commit
5 years ago