Commit Graph

39 Commits

Author SHA1 Message Date
SJ 3df1ffe3b7 3rd Party static libraries need to be public dependencies to work from installed engine.
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
2021-04-20 14:11:08 -07:00
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 2021-04-20 12:16:40 -07:00
mbalfour d9fe89ba56 Addressed feedback - made string& into a string_view. 2021-04-20 13:37:10 -05:00
mbalfour e8459898a7 Exposed Quaternion::CreateFromEulerAnglesDegrees and Transform::Transform(Vector3, Quaternion, Vector3) to the behavior context to improve usability of these classes from scripts.
(cherry picked from commit 8156beb21181f9ff20972c8ea8be5e3dc61f1700)
2021-04-20 09:08:40 -05:00
mbalfour 33e61ad35b Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts.
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
2021-04-20 09:08:19 -05:00
mcgarrah 9412078992 Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
2021-04-19 10:23:58 -05:00
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 2021-04-16 21:12:55 -05:00
mcgarrah 603ee5bf83 Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry 2021-04-16 18:55:08 -05:00
mcgarrah 96ef349931 Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
2021-04-16 18:55:06 -05:00
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 2021-04-16 18:55:05 -05:00
mcgarrah 373f60f29c Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root 2021-04-16 18:54:58 -05:00
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 2021-04-16 15:23:26 -05:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-16 12:04:14 +01:00
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
2021-04-15 22:40:58 -05:00
kberg-amzn c2f9019f7c Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-15 16:30:36 -07:00
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-15 18:26:54 +01:00
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 2021-04-15 10:32:46 +01:00
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-04-14 17:47:58 -07:00
Esteban Papp 90ad9f5141 SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 2021-04-14 12:14:38 -07:00
Mike Balfour efe5715e68 Merge branch 'main' into mbalfour/spec-6178 2021-04-14 12:07:58 -05:00
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 2021-04-14 08:32:59 -05:00
hultonha 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-14 12:31:57 +01:00
hultonha e1e746066d add some preliminary tests for ByteStreamSerializer 2021-04-14 12:04:23 +01:00
hultonha 2655aaa633 update ByteStreamSerializer to use Base64 encoding 2021-04-14 11:30:40 +01:00
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 2021-04-13 20:24:08 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
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.
2021-04-13 15:38:48 -05:00
hultonha 063b8a6d54 update some reinterpret_cast calls to static_cast 2021-04-13 12:16:55 +01:00
hultonha 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) 2021-04-13 11:54:22 +01:00
jackalbe 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
greerdv 8ee92978f4 setting max value for scale 2021-04-12 13:07:40 +01:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00