Commit Graph

223 Commits

Author SHA1 Message Date
Mike Balfour 9aa44a56e7 Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
2021-06-22 15:14:22 -05:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
AMZN-puvvadar 0186911a3a Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
puvvadar 55f5e9f0ae Remove unnecessary forward declare 2021-06-22 09:25:29 -07:00
puvvadar f2bc80d103 Remove obvious comment 2021-06-21 14:53:19 -07:00
puvvadar f49e5cf645 Validate some base cases in InitializeMultiplayer 2021-06-21 14:49:49 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 2021-06-21 11:46:16 -07:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 2021-06-20 20:51:59 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 2021-06-17 16:25:44 -07:00
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 2021-06-17 16:17:36 -07:00
Gene Walters b9dd7a1ecd Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code 2021-06-17 16:16:38 -07:00
Gene Walters 4be9ce56c4 Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
Gene Walters 0810f353c6 Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty 2021-06-17 09:11:48 -07:00
puvvadar be71aec4e3 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into mp_systemcomp_cleanup 2021-06-16 15:46:22 -07:00
puvvadar 2b8e87f674 Begin cleaning MPSysComponent 2021-06-16 15:46:10 -07:00
Gene Walters bcd008df20 Allowing network properties to generate event bindings while staying hidden from script by using a new ExposeToScript attribute. This was useful in hiding NetworkTransformComponent properties which needed event binding in order to update the normal transform, but remain hidden from scripters who should still be using the normal transform component 2021-06-15 21:22:45 -07:00
puvvadar 2a6009c94b Cleanup OnDisconnect client case slightly 2021-06-15 17:46:51 -07:00
puvvadar cf5641a211 Cleanup shutdown, activate and deactivate for MPSystemComponent 2021-06-15 14:53:23 -07:00
puvvadar 2eca923694 Rework session validation to work through Connect packet 2021-06-15 14:34:24 -07:00
puvvadar adc09435f4 Cleanup validation failure logic 2021-06-15 11:08:59 -07:00
puvvadar 04bf6c3689 Separate out session validation into its own packet 2021-06-15 10:14:02 -07:00
Gene Walters 548f65e5d8 Merge pull request #1206 from aws-lumberyard-dev/SPEC7223_MultiplayerComponentRPC_BehaviorContext_ParameterNames
Multiplayer RPC Parameter Names Exposed to Behavior Context
2021-06-09 13:31:12 -07:00
AMZN-puvvadar 5bdf9e3c6d Merge pull request #1175 from aws-lumberyard-dev/mp_session_integ
Integrating AzFramework Session hooks to Multiplayer
2021-06-09 10:39:31 -07:00
Gene Walters 618b7d12bb Add parameter names to RPC behavior context so users know what each parameter does. Also added tooltip, although script canvas isnt always showing it (I will create a separate bug) 2021-06-08 23:58:07 -07:00
puvvadar 59d0a8817e Fix inconsistent naming and cover edge case 2021-06-08 22:56:53 -07:00
puvvadar da7870bb2a Fix some typos and comments 2021-06-08 22:46:45 -07:00
puvvadar 056e170eb6 Check for dns name on request player join 2021-06-08 16:48:23 -07:00
puvvadar cd5867d2fa Cleanup session changes and add on connection disconnected event 2021-06-08 16:43:36 -07:00
puvvadar fa55b495c4 Add handling for session provider ticket 2021-06-08 13:36:27 -07:00
Gene Walters 260b2851f3 Merge pull request #1148 from aws-lumberyard-dev/SPEC7174_ReceiveRPCsViaScriptViaEntityId
Allow Script Canvas Users to Listen for RPC Events Via EntityId
2021-06-08 09:23:36 -07:00
puvvadar 2b227a17d1 Remove extraneous code 2021-06-07 17:20:12 -07:00
puvvadar 45b1bbc85c Fix duplicate include 2021-06-07 17:13:52 -07:00
puvvadar 6f4c0c2ce8 Rename interfaces for clarity 2021-06-07 17:12:29 -07:00
puvvadar 03989f77bb Cleanup includes 2021-06-07 17:06:00 -07:00
puvvadar 40c7a6bd2d Integrate remaining requests and rename Handling Requests interfaces for clarity 2021-06-07 17:02:42 -07:00
Esteban Papp 36cb0f6d40 SPEC-7178 Removal of precompiled cpp files (#1171)
* SPEC-7178  Removal of precompiled cpp files

* Missing files...
2021-06-07 15:59:58 -07:00
puvvadar 5274019d31 Merge branch 'main' into mp_session_integ 2021-06-07 13:46:18 -07:00
Gene Walters 3e74c4f1e1 fixed minor type. Beh method name should say entityId, not entity 2021-06-07 09:22:13 -07:00
AMZN-koppersr 4eb5b3554e Merge branch 'main' into SpawnableEntityIdMapping 2021-06-04 14:00:06 -07:00
puvvadar 6ed6f3f808 Merge branch 'main' into mp_session_integ 2021-06-04 13:22:46 -07:00
Gene Walters c586ff1ca6 Allow script canvas user to listen for RPC events 2021-06-04 12:12:02 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
puvvadar 1d6c69dea2 Merge main to mp_session_integ 2021-06-03 15:36:45 -07:00
puvvadar c55f65b78f Integrate parts of Session Server API 2021-06-03 15:35:16 -07:00
AMZN-koppersr 1e7ac60949 Reintroduced spawning multiple instances of the same entity
The following was changed:
- The remapper in AZ::IdUtils now has an additional argument to tell it what to do when it encounters the same source entity id. The original behavior of ignoring the new entity id and returning the first occurrence is the default. The alternative behavior is to store the last known entity id and return that instead.
- Split the optional arguments for SpawnAllEntities and SpawnEntities.
- SpawnEntities now has an option to continue with the entity mapping from a previous spawn call or to start with a fresh mapping. The latter is the default as the former will come at a performance cost since the mapping table has to be reconstructed.
- Entities spawned using SpawnEntities and ReloadEntities now also get the correct entity mapping applied.
- Added several new unit tests to cover most of the new functionality.
- Fixed some places where the older API version was still called.
2021-06-03 10:56:34 -07:00
Gene Walters 8666ca6467 Merge pull request #1119 from aws-lumberyard-dev/SPEC7150_AllowScriptCanvasUsersToSendRPC
SPEC-7150 Allow Script Canvas Users to Send RemoteProcedures via EntityId
2021-06-03 10:10:54 -07:00
AMZN-puvvadar e340f3ca56 Merge pull request #1102 from aws-lumberyard-dev/MultiplayerPipeline
Fixed ctrl+g port number
2021-06-03 08:50:29 -07:00