f0cf27b8d3
adding the testing files for testing for python asset building and scripting
...
the scene_api gets a small update for mesh_group_add_advanced_coordinate_system(self,
2021-04-16 13:58:57 -05:00
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.
2021-04-15 11:20:19 -05:00
ebebc05cd1
Reenable Blast Automated tests ( #42 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-15 16:16:31 +01:00
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.
2021-04-14 23:13:31 -05:00
3d3f43b0b9
Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes
...
Atom/moudgils/mac runtime fixes
2021-04-14 20:57:40 -07:00
c97dae47b7
Merge pull request #22 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904_2
...
[ATOM-14904] Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
2021-04-14 18:53:23 -07:00
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
2021-04-14 15:51:04 -07:00
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
2021-04-14 15:47:56 -07:00
6541ca4cb0
Merge pull request #18 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904
...
[ATOM-14904] Partial fix to Material Editor shutdown
2021-04-14 12:23:25 -07:00
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-14 10:47:18 -07:00
bbec18d030
Fix initial camera position when working directly with Atom
2021-04-14 10:45:22 -07:00
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
2021-04-14 12:07:58 -05:00
6f67aabd67
Minor cleanup
2021-04-14 09:42:13 -07:00
9aec30a608
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 21:48:17 -07:00
7b6ecc036b
Minor updates
2021-04-13 21:16:04 -07:00
68d58f48ae
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 19:45:18 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
e6c12499f7
Added raytracingscenesrg.srgi to the default project template and AutomatedTesting project.
...
Added assert to check for successful load of the raytracingscenesrg asset.
2021-04-13 14:05:48 -07:00
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.
2021-04-13 15:38:48 -05:00
16ba08c917
Mac compile fixes, Fix imgui rendering, Introduce a new RHI::BufferBindFlag, Fix a crash in AsyncStreaming, Fix shader build errors
2021-04-13 11:03:27 -07:00
921eb742d4
Merge branch 'main' into github/staging
2021-04-13 09:46:26 -07:00
1a7bf94917
Merge branch 'main' into Atom/mnaumov/ATOM-14904_2
2021-04-12 22:27:18 -07:00
2f117c553d
Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes
2021-04-12 16:27:40 -07:00
f188e1c9a7
Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
2021-04-12 16:03:10 -07:00
51a1b19730
Merge branch 'main' into Atom/mnaumov/ATOM-14904
2021-04-12 12:41:52 -07:00
22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes
2021-04-12 12:15:45 -07:00
cb2ee625be
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
2021-04-12 19:51:04 +01:00
cd12226849
Merge branch 'main' into github/staging
2021-04-12 08:48:09 -07:00
aa0b54838c
Fix PhysXDebug and PhysXEditor loading order ( #14 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-12 14:16:01 +01:00
0dd57ae901
Adding mutex to ImageProcessingBus
2021-04-09 21:18:30 -07:00
2190787c40
Fix build
2021-04-09 14:19:05 -07:00
d09dc500d3
fake commit
2021-04-09 14:55:39 -05:00
1dabb39b98
Migrate fixes from CodeCommit branch
2021-04-09 12:40:43 -07:00
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
2021-03-26 17:05:57 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
jackalbe
Ken Pruiksma
Ulugbek Adilbekov
moudgils
AMZN-mnaumov
dmcdiarmid-ly
Nicholas Van Sickle
Mike Balfour
moudgils
alexpete
mbalfour
Alex Peterson
mnaumov
Nicholas Van Sickle
moraaar
jackalbe
Brian Herrera