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.
2021-04-16 18:28:12 +01:00
2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
...
SystemComponent is now only built once in the PhysX.Static target
2021-04-16 14:04:00 +01:00
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-16 12:04:14 +01:00
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
2021-04-16 09:57:04 +01:00
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
2021-04-15 17:56:08 -07:00
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-15 16:30:36 -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
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
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
2021-04-15 11:01:15 -07:00
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-15 18:26:54 +01:00
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 14:17:11 +01:00
10ab7666db
Merge branch 'main' into limit_max_scale
2021-04-15 13:44:53 +01:00
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
2021-04-15 12:24:48 +01:00
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
2021-04-15 10:32:46 +01:00
2410d299c1
Make creation of new prefabs use a relative path to the project
2021-04-14 17:51:15 -07:00
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-04-14 17:47:58 -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
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
2021-04-14 12:14:38 -07:00
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-14 10:47:18 -07:00
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
2021-04-14 12:07:58 -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
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-14 12:31:57 +01:00
e1e746066d
add some preliminary tests for ByteStreamSerializer
2021-04-14 12:04:23 +01:00
2655aaa633
update ByteStreamSerializer to use Base64 encoding
2021-04-14 11:30:40 +01:00
ca3df5d6c8
Various bug fixes to get entity replication working
2021-04-13 20:24:08 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -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
f6e98d5014
Fix viewport context menu hiding cursor and sometimes popping up repeatedly
2021-04-13 11:08:22 -07:00
063b8a6d54
update some reinterpret_cast calls to static_cast
2021-04-13 12:16:55 +01:00
8846e159e0
Add new ByteStream serializer to support storing binary data in json (for now)
2021-04-13 11:54:22 +01:00
90e52d69bc
fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs
2021-04-13 10:50:07 +01:00
63c97d6d3c
Merge branch 'main' into sceneapi_script_autotest
2021-04-12 14:27:41 -05:00
77d06ecef7
ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
...
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename
Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
2021-04-12 12:30:30 -05:00
cd12226849
Merge branch 'main' into github/staging
2021-04-12 08:48:09 -07:00
8ee92978f4
setting max value for scale
2021-04-12 13:07:40 +01:00
51f1183ff4
making scale gizmo apply uniform scale to transform
2021-04-10 15:58:42 +01: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
Tom Hulton-Harrop
amzn-sean
hultonha
greerdv
karlberg
kberg-amzn
srikappa-amzn
Terry Michaels
srikappa
Nicholas Van Sickle
SergeyAMZN
Esteban Papp
Mike Balfour
jackalbe
pereslav
alexpete
mbalfour
jackalbe
Alex Peterson
Brian Herrera