Commit Graph

147 Commits

Author SHA1 Message Date
amzn-mike 16ca036ea8 Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
Disable Asset Load Cancellation
2021-04-23 13:10:56 -05:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
amzn-mike d25179303d Add jira ticket for disabled tests 2021-04-23 10:50:58 -05:00
amzn-mike c61b244416 Use a const to toggle asset cancellation on and off 2021-04-23 09:56:59 -05:00
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 2021-04-22 17:01:29 -07:00
daimini 8f79379bc8 Fixes as per Ram's review 2021-04-22 16:45:20 -07:00
daimini 76739de282 Fix spacing 2021-04-22 15:52:39 -07:00
daimini ea43eb3ac9 Set position of instantiated prefab 2021-04-22 15:49:13 -07:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
daimini c9a4b6f50b Better handle the default case for Instantiate 2021-04-22 14:53:07 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 2021-04-22 15:38:32 -05:00
amzn-mike 58e8233c2c Remove debug message 2021-04-22 15:27:16 -05:00
amzn-mike 0428189bed Increase test difficulty 2021-04-22 15:18:54 -05:00
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 2021-04-22 15:03:04 -05:00
amzn-mike 35a47932eb Disable weak references and unit tests for them. 2021-04-22 15:02:41 -05:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00
amzn-mike 3907ffc173 Add unit test 2021-04-22 12:01:21 -05:00
mbalfour bd23944531 Fix issues with rapid asset cancellation / reload:
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference.  This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it.  The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset.  Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load.  They are no longer added, since they shouldn't be waiting for any dependent assets to load.  (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list.  The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it.  This prevents asset containers that are in the middle of cancellation from getting reused.
2021-04-22 12:01:19 -05:00
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 2021-04-22 09:47:18 -07:00
AMZN-AlexOteiza dbcb2f9916 Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
2021-04-22 17:46:37 +01:00
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 2021-04-22 11:42:58 -05:00
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 2021-04-22 10:06:40 -05:00
mnaumov 5f0e7f2cbc merge from main 2021-04-21 19:21:02 -07:00
daimini 67fa4a332b Change CreateLink to return the LinkId 2021-04-21 17:43:22 -07:00
daimini ca8d6f8818 Instantiate Prefab 2021-04-21 17:42:33 -07:00
Luis Sempé 8996976efb Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
2021-04-21 17:34:31 -07:00
luissemp 49322b040b Fixed Lua IDE startup 2021-04-21 15:37:15 -07:00
cgalvan 7a6b0c16b7 Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
2021-04-21 16:43:14 -05:00
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 2021-04-21 14:54:19 -05:00
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 2021-04-21 14:48:00 -05:00
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 2021-04-21 13:57:16 -05:00
phistere 70b4938cff LYN-2524: Launch AP from SDK when not found in the executable directory 2021-04-21 11:55:01 -05:00
amzn-sean 743d6a511a Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
2021-04-21 17:37:35 +01:00
SergeyAMZN 0a09ab7c8e Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
2021-04-21 12:54:28 +01:00
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 2021-04-21 11:13:27 +01:00
amzn-sean b0cb5a381b Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
2021-04-21 11:09:32 +01:00
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 2021-04-21 10:56:36 +01:00
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
2021-04-20 20:05:32 -07:00
Nicholas Van Sickle e8cd122b86 Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
2021-04-20 19:45:01 -07:00
AMZN-daimini 62bc7a66bb Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
2021-04-20 16:22:34 -07:00
srikappa-amzn f8c5048b56 Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
2021-04-20 15:42:05 -07:00
nvsickle 4f9d7e3782 Simplify ResetInputChannels 2021-04-20 15:27:38 -07:00
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
2021-04-20 15:27:34 -07:00
srikappa 78892c8d7e Improved a couple of comments 2021-04-20 14:30:56 -07:00
pereslav 465546a6e4 Merge branch 'main' into MultiplayerPipeline 2021-04-20 22:11:52 +01:00
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