Commit Graph

96 Commits

Author SHA1 Message Date
Tom Hulton-Harrop f9fb61cc5d Fix issue with viewport interaction ordering and viewport matrix changed handler (#695)
* fix for ctrl+mouse-wheel to cycle transform modes in the viewport

* ensure correct callback function is invoked

* remove redundant check in CameraInput
2021-05-12 09:40:37 +01:00
karlberg 35500981eb More removal fixes 2021-05-11 16:36:44 -07:00
karlberg 3169b3477d Adding missing files to azframework_files.cmake and fixing include errors due to network removal 2021-05-11 15:15:35 -07:00
karlberg 74385a575f Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-11 13:43:17 -07:00
karlberg 3e13dd52d1 First pass, removing gridmate touchpoints from AzFramework and non inclusive terminology purge 2021-05-11 12:47:15 -07:00
Tom Hulton-Harrop 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
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
karlberg 9c23e637a0 Fix for white box test weirdness 2021-05-08 18:24:13 -07:00
karlberg 851323e112 One more test crash fix due to nullptr component application 2021-05-08 10:05:16 -07:00
karlberg 6b9ecc69c9 two more unit test touchpoints where core systems may not be initialized 2021-05-07 20:45:35 -07:00
karlberg 1df2fe1d48 Merging latest origin 2021-05-07 16:28:11 -07:00
Nicholas Van Sickle b026b6818b Merge pull request #483 from aws-lumberyard-dev/nvsickle/ViewportControllerAPI
Give MultiViewportControllerInstances a pointer to their parent
2021-05-07 13:53:50 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00
karlberg a8fa7a59d4 CR feedback 2021-05-07 10:03:07 -07:00
Steve Pham 2633efbd13 Moving SystemUtilsApple.mm and SystemUtilsApple.h from CrySystem to AzFramework to fix linker error when building iOS non-monolithically (#631) 2021-05-07 07:34:35 -07:00
greerdv 4202f646e4 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 15:20:29 +01:00
amzn-sean cb4e394784 Remove physics world body notification bus (#576) 2021-05-07 14:12:07 +01:00
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-06 19:40:09 -07:00
sourjon cd0628f513 Merge pull request #565 from aws-lumberyard-dev/Prefab/PhysX/ColliderFixes
Prefab/physx/collider fixes - Addresses collider crashes on starting in game mode
2021-05-06 19:07:58 -07:00
nvsickle b848e2dcd1 Appease clang 2021-05-06 18:37:52 -07:00
nvsickle ea8e098e33 Tidy up MultiViewportControllerInstanceInterface 2021-05-06 17:53:23 -07:00
karlberg 4b1fe9b10b Fix a comment and minor optimization to the server to client replication window 2021-05-06 17:35:48 -07:00
nvsickle e8f37bb29f Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI 2021-05-06 17:16:39 -07:00
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
SergeyAMZN dd90c590aa Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 18:17:44 +01:00
greerdv a49017ec23 merging from main 2021-05-05 13:26:08 +01:00
pereslav 30625cf5d3 merge from main 2021-05-05 00:09:25 +01:00
pereslav e414cc151d SPEC-6590 Implemented network entities instantiation by network spawnable asset ID 2021-05-05 00:00:06 +01:00
jonbeer b55e881225 Merge branch 'main' into Prefab/PhysX/ColliderFixes 2021-05-04 15:08:37 -07:00
rgba16f 27472169e2 Change global default scene debug draw id variale declare from static constexpr const to inline constexpr 2021-05-04 17:06:22 -05: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
Olex Lozitskiy 790657f8c0 Merge pull request #526 from aws-lumberyard-dev/Atom/olexl/ATOM-15349
Deleted AzFramework::AtomActiveInterface
2021-05-04 13:44:04 -04: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
jonbeer 02a9b4411b Merge from main 2021-05-04 09:09:27 -07:00
Aristo7 4c47d7b587 Merged main in 2021-05-04 10:13:50 -05:00
hultonha 36d502b560 update controls for camera and move settings to cfg file 2021-05-04 14:06:10 +01:00
hultonha 16b16706b5 add logic to convert matrix3x3 to euler angles 2021-05-04 14:05:55 +01:00
hultonha d705864f88 fix for input being 'stuck' on 2021-05-04 14:05:50 +01:00
Tom Hulton-Harrop 83545c0243 Merge pull request #470 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-2
Updates to new Camera System (part 2 - still in progress)
2021-05-04 09:59:47 +01:00
Chris Burel 31885753cb Fixes for compile failures with Clang on Windows (#532)
* Fix compile errors when building with Clang.

* Fix for clang-based unity builds
2021-05-03 22:46:28 -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
karlberg 822368ef01 Changes to get visibility system working again in-game 2021-05-03 16:26:11 -07:00
jonbeer 6eddf39eff Adding additional PhysX tests for work with Prefabs 2021-05-03 15:27:26 -07:00
Aristo7 64d980bc03 Deleted AzFramework::AtomActiveInterface 2021-05-03 15:40:32 -05:00
AMZN-koppersr 5eeeaf4346 Fixed several release build compile errors. 2021-05-01 13:26:54 -07:00
nvsickle db9df91977 Give MultiViewportControllerInstances a pointer to their parent controller, to allow state management 2021-04-30 10:46:29 -07:00
hultonha fb46d11f6c add missing const 2021-04-30 14:52:14 +01:00