e989a2e697
Merge branch 'limit_max_scale' of https://github.com/aws-lumberyard-dev/o3de into limit_max_scale
2021-04-15 14:00:44 +01:00
10ab7666db
Merge branch 'main' into limit_max_scale
2021-04-15 13:44:53 +01: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
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
2021-04-14 20:55:27 -05: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
8b265d2e8d
Initial version that I need to test out ( #60 )
...
LYN-2585 Add cmake/install job to Jenkins
2021-04-14 17:38:57 -07:00
be85d2ea58
Merge pull request #57 from aws-lumberyard-dev/build/SPEC-5588
...
Prevent skipping build if it's from a pull request
2021-04-14 17:30:13 -07:00
03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295
...
[iOS] Fix build issues
2021-04-14 16:47:12 -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
d29fe24396
Merge remote-tracking branch 'upstream/main' into LYN-2883
2021-04-14 17:43:20 -05:00
7609248c49
Fix build errors
2021-04-14 15:42:24 -07:00
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
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.
2021-04-14 14:58:22 -07:00
4a3d24f189
SPEC-6276 Move ci_build and ci_build_metrics to scripts\build
2021-04-14 14:40:42 -07:00
fff97cda3b
Cache runtime dependencies for targets to speed up iOS configuration.
2021-04-14 13:09:21 -07:00
9c01e993db
Convert etc2comp to new 3p system ( #44 )
2021-04-14 12:58:03 -07:00
78e5a069fa
Removed Cry branding on error messages ( #41 )
2021-04-14 14:31:44 -05:00
2c3a98878f
SPEC-6137 Add a non-unity build for Linux in AR gating runs
2021-04-14 12:29:31 -07:00
12088d88a0
SPEC-6275 Remove AutomatedReview folder
2021-04-14 12:27:14 -07:00
042241a119
SPEC-6268 Remove check for 3rdParty.txt
2021-04-14 12:26:20 -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
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
2021-04-14 12:14:38 -07:00
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.
2021-04-14 14:10:08 -05:00
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-14 10:47:18 -07:00
97d0f42671
Enable EditorViewportWidget by default
2021-04-14 10:45:54 -07:00
bbec18d030
Fix initial camera position when working directly with Atom
2021-04-14 10:45:22 -07:00
70c2d5ee40
SPEC-5789 Remove inclusion of CMakeParseArguments
2021-04-14 10:24:23 -07:00
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
2021-04-14 12:07:58 -05:00
bd4c813dc6
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-14 09:46:00 -07:00
6f67aabd67
Minor cleanup
2021-04-14 09:42:13 -07:00
2961e31f45
Merge pull request #20 from aws-lumberyard-dev/sceneapi_script_autotest
...
ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
2021-04-14 11:17:30 -05:00
e8f4fac16a
Merge branch 'sceneapi_script_autotest' of https://github.com/aws-lumberyard-dev/o3de into sceneapi_script_autotest
2021-04-14 08:34:17 -05:00
a7a22bfcc0
Merge branch 'main' into sceneapi_script_autotest
2021-04-14 08:32:59 -05:00
59252235d5
Fixed dangling pointer in InitializeCatalog
2021-04-14 13:13:01 +01:00
21f861a702
Merge branch 'main' into MultiplayerPipeline
2021-04-14 10:25:11 +01:00
9aec30a608
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 21:48:17 -07:00
e4db6829fb
Merge pull request #35 from aws-lumberyard-dev/github/staging
...
Integrating github/staging through commit 5f214be
2021-04-13 21:20:15 -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
957945f809
Clarified the error message that is output when the project.json is not found
2021-04-13 19:50:06 -05:00
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
2021-04-13 19:42:30 -05:00
fa9366b810
Updating the AutomatedTesting project to support being built as an External Project
2021-04-13 19:35:59 -05:00
774580cea2
Updating README to mention 3p rev13
2021-04-13 17:30:43 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
e56f43b962
Merge branch 'LYN-2883' of https://github.com/aws-lumberyard-dev/o3de into LYN-2883
2021-04-13 18:54:32 -05:00
51928f779f
Merge branch 'main' into LYN-2883
2021-04-13 18:52:59 -05:00
cf70cc9a37
Merge branch 'main' into LYN-2883
2021-04-13 18:52:16 -05:00
8c0bb18235
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-13 16:45:03 -07:00
2a9dfb7a1d
Merge pull request #25 from aws-lumberyard-dev/build-strike/SPEC-6281
...
Convert daily metrics pipeline script to use BlueOcean API
2021-04-13 16:05:55 -07:00
greerdv
moudgils
lumberyard-employee-dm
AMZN-mnaumov
Esteban Papp
Brian Herrera
SJ
dmcdiarmid-ly
Nicholas Van Sickle
mcgarrah
SergeyAMZN
Chris Burel
Terry Michaels
Mike Balfour
moudgils
jackalbe
pereslav
Alex Peterson
alexpete
Shirang Jia