c2a9ab18e4
Merge branch 'main' into Spawnable/ProductDependency
2021-05-11 09:59:50 -07:00
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
b5e5a3bfee
More camera fixes for the new CameraInput system ( #667 )
...
* use new ViewportContext interface to set camera transform on load
* WIP fixes for camera viewport handler callbacks
* disable synchonization with old camera when new camera system is enabled
* further updates to camera-input
* ensure event is signalled when camera transform is set
* updates to ModernViewportCameraController
* fix for right click menu appearing with camera
* updates following review feedback
* convert std:: usage to AZStd::
2021-05-11 13:38:09 +01:00
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
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
36911723c2
Addressed PR feedback
2021-05-10 18:17:39 -07:00
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
f7ea02afdc
Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg
2021-05-10 13:21:13 -07:00
17ccf90480
Updated function header comment
2021-05-10 12:59:16 -07:00
4c0fdf78bc
Added error messaging, cleaned up LoadReferencedAssets
2021-05-10 12:56:54 -07:00
2e9ae76596
Removed print statement, adding in new files that were missed
2021-05-10 12:11:53 -07:00
b04bfc459f
Asset Preload fix for json serialization and prefab game mode
2021-05-10 11:46:58 -07:00
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
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
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
9a113c083d
Checked all Search boxes and made them compliant with UX specs.
2021-05-10 11:46:16 +01:00
6b9ecc69c9
two more unit test touchpoints where core systems may not be initialized
2021-05-07 20:45:35 -07:00
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
e24827efb3
Fix direct editing of a reference
2021-05-07 17:08:35 -07:00
ae8a49c4ef
fix bad merge
2021-05-07 16:51:53 -07:00
4662290d92
Switching IsPrefabInInstanceAncestorHierarchy to use const refs
2021-05-07 16:50:41 -07:00
47001dc0c3
Merge main
2021-05-07 16:42:51 -07:00
1df2fe1d48
Merging latest origin
2021-05-07 16:28:11 -07:00
9f5987d431
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 19:55:26 +01:00
3817c05d81
fixing unit test
2021-05-07 19:54:59 +01:00
c5a06b8953
Restore grid and angle snapping ( #640 )
...
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
4202f646e4
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 15:20:29 +01:00
9e22268107
feedback from PR
2021-05-07 15:18:51 +01:00
2c6d04f673
feedback from PR
2021-05-07 15:03:57 +01:00
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
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
ad6479967f
changing add NUS button from invisible to read only when NUS component already present
2021-05-06 22:15:00 +01:00
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
2021-05-06 13:10:55 -07:00
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
751d13dd7b
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-05 20:07:49 -07:00
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
45cbe4767f
adding comment to AddNonUniformScaleButton
2021-05-05 15:14:50 +01:00
a49017ec23
merging from main
2021-05-05 13:26:08 +01:00
e1f7d04bc2
adding icon for non-uniform scale component
2021-05-05 13:10:01 +01:00
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
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
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
1c1a9aeab4
Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID
2021-05-04 14:40:31 -05:00
593528532f
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId
2021-05-04 14:36:48 -05:00
5e94c9c838
fixing highlighting behaviour when trying to drag components above non-uniform scale component
2021-05-04 18:59:04 +01:00
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
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
a206896074
remove QPoint from lower-level interfaces, switch to use AzFramework::ScreenPoint
2021-05-04 17:32:47 +01:00
bbe3fcfdd9
Cleans up some debug code
2021-05-04 08:49:35 -07:00
d0a561fa01
merging latest origin
2021-05-03 21:27:27 -07:00
sconel
sconel
Tom Hulton-Harrop
Danilo Aimini
Terry Michaels
kberg-amzn
bosnichd
jjjoness
karlberg
daimini
greerdv
AMZN-mnaumov
mnaumov
chiyenteng
rgba16f
srikappa-amzn
jackalbe
hultonha