Mike Balfour
9ccddab552
Merge pull request #694 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
...
Fix up incorrect autoDelete use and handling.
2021-05-11 12:02:28 -05:00
sconel
2e32b2ee57
Merge pull request #671 from aws-lumberyard-dev/Prefabs/AssetPreload
...
Asset Preload fix for json serialization and prefab game mode
2021-05-11 09:35:06 -07:00
mbalfour
704443ac89
Fix up incorrect autoDelete use and handling.
...
Several UI property handlers were incorrectly using the autoDelete feature by calling UnregisterPropertyType and deleting the pointer themselves, which caused double-delete crashes on application shutdown. PropertyManagerComponent now gracefully handles that condition but also explicitly asserts explaining how the code should be changed, and the "known offenders" have been fixed up to use autoDelete correctly.
2021-05-11 10:25:03 -05:00
Danilo Aimini
d61c93a7b6
Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
...
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
2021-05-10 23:09:51 -07:00
Terry Michaels
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
sconel
36911723c2
Addressed PR feedback
2021-05-10 18:17:39 -07:00
sconel
93974dd1c5
Seperated queue load and blocking load calls so queue loads aren't interrupted. Added comment about asset dispatch events
2021-05-10 14:22:48 -07:00
sconel
f7ea02afdc
Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg
2021-05-10 13:21:13 -07:00
sconel
17ccf90480
Updated function header comment
2021-05-10 12:59:16 -07:00
sconel
4c0fdf78bc
Added error messaging, cleaned up LoadReferencedAssets
2021-05-10 12:56:54 -07:00
sconel
2e9ae76596
Removed print statement, adding in new files that were missed
2021-05-10 12:11:53 -07:00
sconel
b04bfc459f
Asset Preload fix for json serialization and prefab game mode
2021-05-10 11:46:58 -07:00
Tom Hulton-Harrop
b2523217c3
Update snapping settings to be stored in the Settings Registry ( #646 )
...
* add overload to ActionManager to support capturing an AZStd::function
* move snapping settings to new settings registry
* remove unneeded reference in ViewportSettings
* move viewport setting function implementations to .cpp file
* add more sensible default values for snapping
* fix variable name for angle snapping
* remove const from function prototype value parameters
* add import/export api for free functions
* change from std::bind to a lambda
* remove redundant const for constexpr string_view
* add AZStd alias for std::abs
2021-05-10 18:40:32 +01:00
kberg-amzn
bdaa7eb3c1
Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components, visibility fixes for gameplay runtime and localprediction player controller component.
2021-05-10 10:23:15 -07:00
bosnichd
440c40e490
Remove (almost) all references to pRenderer ( #651 )
...
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
jjjoness
9a113c083d
Checked all Search boxes and made them compliant with UX specs.
2021-05-10 11:46:16 +01:00
karlberg
6b9ecc69c9
two more unit test touchpoints where core systems may not be initialized
2021-05-07 20:45:35 -07:00
Danilo Aimini
656a8443bc
Merge pull request #382 from aws-lumberyard-dev/Prefab/Instantiate/Loop
...
LYN-3245 | Detect circular dependencies on Instantiate Prefab and cancel operation
2021-05-07 18:43:01 -07:00
daimini
e24827efb3
Fix direct editing of a reference
2021-05-07 17:08:35 -07:00
karlberg
ae8a49c4ef
fix bad merge
2021-05-07 16:51:53 -07:00
daimini
4662290d92
Switching IsPrefabInInstanceAncestorHierarchy to use const refs
2021-05-07 16:50:41 -07:00
daimini
47001dc0c3
Merge main
2021-05-07 16:42:51 -07:00
karlberg
1df2fe1d48
Merging latest origin
2021-05-07 16:28:11 -07:00
greerdv
9f5987d431
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 19:55:26 +01:00
Tom Hulton-Harrop
c5a06b8953
Restore grid and angle snapping ( #640 )
...
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
greerdv
4202f646e4
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 15:20:29 +01:00
greerdv
9e22268107
feedback from PR
2021-05-07 15:18:51 +01:00
greerdv
2c6d04f673
feedback from PR
2021-05-07 15:03:57 +01:00
karlberg
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
AMZN-mnaumov
5fb923738e
Merge pull request #614 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15474
...
[ATOM-15474] Material Editor camera controller zoom respects viewport boundary
2021-05-06 17:45:47 -07:00
greerdv
ad6479967f
changing add NUS button from invisible to read only when NUS component already present
2021-05-06 22:15:00 +01:00
mnaumov
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
2021-05-06 13:10:55 -07:00
chiyenteng
ede1889507
[CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode ( #585 )
...
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490 )
2021-05-06 10:39:43 -07:00
karlberg
751d13dd7b
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-05 20:07:49 -07:00
rgba16f
7b95b5e329
Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
...
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
2021-05-05 10:34:17 -05:00
greerdv
45cbe4767f
adding comment to AddNonUniformScaleButton
2021-05-05 15:14:50 +01:00
greerdv
a49017ec23
merging from main
2021-05-05 13:26:08 +01:00
greerdv
e1f7d04bc2
adding icon for non-uniform scale component
2021-05-05 13:10:01 +01:00
Tom Hulton-Harrop
cec56d7b27
Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4
...
Camera Updates - Part 4
2021-05-05 09:46:56 +01:00
greerdv
cd93df4ca8
hiding button to add non-uniform scale when there already is a NUS component on the entity
2021-05-04 23:15:51 +01:00
srikappa-amzn
a5ccfa6053
Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix undo for nested prefab creation by providing link patches to the undo node
2021-05-04 13:20:37 -07:00
rgba16f
1c1a9aeab4
Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID
2021-05-04 14:40:31 -05:00
rgba16f
593528532f
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId
2021-05-04 14:36:48 -05:00
greerdv
5e94c9c838
fixing highlighting behaviour when trying to drag components above non-uniform scale component
2021-05-04 18:59:04 +01:00
jackalbe
8b1251c9f7
{LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function ( #392 )
...
* {LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function
* Updated the EditorPythonConsoleInterface to get Python type name info
* Added PythonBehaviorInfo to the GraphObjectProxy object to reflect abstract calls that can be invoked
* removed SCENE_DATA_API from Reflect() function
Jira: https://jira.agscollab.com/browse/LYN-2185
Tests: Added tests GraphObjectProxy_GetClassInfo_Loads & GraphObjectProxy_GetClassInfo_CorrectFormats to regress test
* fix compile error
* etchPythonTypeName() returns AZStd::string
* put None into a const char
2021-05-04 12:55:47 -05:00
greerdv
d9b3b7ccfa
adding non-uniform scale component via button on transform component and forcing it to be adjacent in the component sort order and visible
2021-05-04 18:31:43 +01:00
hultonha
a206896074
remove QPoint from lower-level interfaces, switch to use AzFramework::ScreenPoint
2021-05-04 17:32:47 +01:00
karlberg
bbe3fcfdd9
Cleans up some debug code
2021-05-04 08:49:35 -07:00
karlberg
d0a561fa01
merging latest origin
2021-05-03 21:27:27 -07:00
karlberg
d5ad5d9596
Removing some more ebus dependencies within the vis system
2021-05-03 21:20:40 -07:00