62b38bdf9e
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 20:24:00 -07:00
82ca4bf221
Merge pull request #80 from aws-lumberyard-dev/AtomTest-Sponza
...
AtomTest Sponza Content
2021-04-15 21:45:02 -05:00
3c631e4a85
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 19:16:29 -07:00
4edbf7890b
Bringing fix that has not been migrated to github yet (fixes Windows release builds)
2021-04-15 19:01:15 -07:00
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-15 16:30:36 -07:00
8743155b73
Merge pull request #76 from aws-lumberyard-dev/Atom/qingtao/ATOM-13791
...
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
LYN-2908 Pressing Home button crashes the Editor
2021-04-15 15:19:25 -07:00
abf26eede1
Bump REsourcePoolBuilder as the bufferBindFlags were updated
2021-04-15 14:00:40 -07:00
ef30f49bf9
Fixed a linux compile issue.
2021-04-15 13:29:29 -07:00
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
2021-04-15 13:20:18 -07:00
a9516c6498
updated the ref to dccsi env that changed
2021-04-15 15:04:36 -05:00
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
2021-04-15 14:28:57 -05:00
8a589ff3e1
Merge pull request #68 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2772
...
[LYN-2772] Adding White Box Component to an Entity silently crashes the Editor
2021-04-15 12:26:37 -07:00
2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
...
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
2021-04-15 11:33:57 -07:00
a9345646f8
fixing a hardcoded path typo that someone submitted on accident.
2021-04-15 13:08:13 -05:00
cc7b4fc251
Updated all materials, did some mesh cleaning adding source file as well.
2021-04-15 13:06:27 -05:00
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
2021-04-15 11:01:15 -07:00
14f7883425
Merge pull request #15 from aws-lumberyard-dev/limit_max_scale
...
setting max value for scale
2021-04-15 17:27:07 +01: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
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
20c1454e4b
Added the ShaderRead buffer bind flag to the static and dynamic input assembly pools, and one creation of a static input assembly buffer.
2021-04-15 03:41:20 -07:00
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07: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
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
2410d299c1
Make creation of new prefabs use a relative path to the project
2021-04-14 17:51:15 -07:00
45faa26ffd
Some initial updates for eventual support of locally predicted input processing
2021-04-14 17:50:04 -07:00
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-04-14 17:47:58 -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
f7aabebb37
Fix context menu popping up when it shouldn't
2021-04-14 17:03:21 -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
moudgils
Jonny Galloway
Esteban Papp
kberg-amzn
Vicky
qingtao
srikappa-amzn
Terry Michaels
dmcdiarmid-ly
Nicholas Van Sickle
srikappa
greerdv
Ken Pruiksma
Ulugbek Adilbekov
greerdv
dmcdiar
moudgils
lumberyard-employee-dm
AMZN-mnaumov
karlberg
Brian Herrera
SJ
mcgarrah
SergeyAMZN
Chris Burel
Mike Balfour