Commit Graph

319 Commits

Author SHA1 Message Date
sphrose b08643d9da Use renamed functions in stylesheet. 2021-05-11 11:24:51 +01:00
sphrose 7276253c42 renamed function 2021-05-11 08:20:44 +01:00
sphrose 9bea26511f Merge branch 'main' into LY-113714 2021-05-11 08:06:16 +01: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
nvsickle 3c315df36f Fix Camera transform property notifications.
Moves transform notification logic from CComponentEntityObject::InvalidateTM (which will eventually go away) to AzToolsFramework::TransformComponent::OnTransformChanged.
We also specifically make sure PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged fires, which is used by Track View to detect camera position changes.
2021-05-10 15:08:41 -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
srikappa 886fe22b16 Merge branch 'main' into Prefab/CreatePrefab 2021-05-10 12:31:18 -07:00
srikappa b57dd02d90 Removed a debug print command 2021-05-10 12:28:33 -07:00
puvvadar b21553f64d Merge branch 'main' into mp_editor_pipeline 2021-05-10 12:21:45 -07:00
sconel 2e9ae76596 Removed print statement, adding in new files that were missed 2021-05-10 12:11:53 -07:00
srikappa 4994103627 Add const ref function parameters as needed 2021-05-10 11:58:54 -07:00
sconel b04bfc459f Asset Preload fix for json serialization and prefab game mode 2021-05-10 11:46:58 -07:00
srikappa 0da6e450a6 Improved comments 2021-05-10 11:43:32 -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
sphrose 29f3185c0b Merge branch 'main' into LY-113714 2021-05-10 11:08:22 +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
srikappa 1c04160966 Added a missing header 2021-05-07 16:23:14 -07:00
srikappa eb8084d3f6 Initial draft for getting instantiation to work immediately after creation is undone 2021-05-07 16:21:23 -07:00
puvvadar c4115fca11 Merge branch 'main' into mp_editor_pipeline 2021-05-07 14:14:17 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00
greerdv 3817c05d81 fixing unit test 2021-05-07 19:54:59 +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
puvvadar 108f4dfdd6 Merge branch 'main' into mp_editor_pipeline 2021-05-06 16:19:15 -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