2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
0a957fb03a
Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
...
LYN-4866 Fixed net entities indices when creating net spawnable
2021-07-02 21:31:42 +01:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
d17390befb
LYN-4866 Fixed net entities indices when creating net spawnable
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-02 16:01:30 +01:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
d7bfd34a67
IFilterEntityManager work
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-06-30 19:18:06 -04:00
1100e20e26
Merged ctrl+g fixes from MultiplayerEditorFixes
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-06-30 13:20:07 +01:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
d6629eea2e
Fix order of ops issue in MP Session Termination
2021-06-24 13:56:16 -07:00
be56cf648d
sig/network - bugfix - removal of player prefabs on disconnect
...
sig/network - bugfix - removal of player prefabs on disconnect
2021-06-24 15:01:41 -05:00
ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
...
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-24 16:56:52 +01:00
6b1d3d1f9a
SPEC-7469 Multiplayer Editor Ctrl+G fails due to EditorInfo packets reordering. SPEC-7471 Multiplayer Editor Ctrl+G asserts after CreateEntitiesImmediate
2021-06-24 01:12:19 +01:00
5a061e409d
Fixed EntityDelete messages
2021-06-23 18:00:13 -04:00
632d774d4c
Add disconnect type param to Terminate
2021-06-23 11:44:21 -07:00
bda758a9c5
Adjust cleanup logic to handle Session events more cohesively
2021-06-23 10:56:22 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
93a34033a9
Correcting tabs
2021-06-23 13:21:54 -04:00
b9dec79743
Clean up
2021-06-23 11:04:25 -04:00
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-23 15:29:31 +01:00
e5aa56d565
Added a runtime switch to turn on/off removal of player spawnable on disconnect
2021-06-23 09:38:43 -04:00
35364c9403
Fixing a nullptr crash in NetworkTime
2021-06-22 23:13:23 -04:00
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
fd021f065a
Fixes to codegen to avoid nullptr access during disconnects
2021-06-22 14:56:10 -04:00
fcbec8c202
Fixed removal of player's prefab on disconnect
2021-06-22 14:55:45 -04:00
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
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
55f5e9f0ae
Remove unnecessary forward declare
2021-06-22 09:25:29 -07:00
f2bc80d103
Remove obvious comment
2021-06-21 14:53:19 -07:00
f49e5cf645
Validate some base cases in InitializeMultiplayer
2021-06-21 14:49:49 -07:00
3a7df983d9
Cleanup listen and connect logic to prevent log spam
2021-06-21 14:31:14 -07:00
8f5681ffdb
Add GetActiveConnectionCount to IConnectionSet
2021-06-21 11:46:16 -07:00
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
526a0f1289
Fix for Jenkins Validation: removing tabs and removing unwanted spaces.
2021-06-20 20:51:59 -07:00
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
2021-06-18 13:25:53 -07:00
04387be083
Remove some redundant includes, forward declares and similar pieces
2021-06-17 16:25:44 -07:00
a748c2e152
Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking
2021-06-17 16:17:36 -07:00
b9dd7a1ecd
Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code
2021-06-17 16:16:38 -07:00
4be9ce56c4
Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
...
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
0810f353c6
Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty
2021-06-17 09:11:48 -07:00
be71aec4e3
Merge branch 'development' of https://github.com/aws-lumberyard/o3de into mp_systemcomp_cleanup
2021-06-16 15:46:22 -07:00
2b8e87f674
Begin cleaning MPSysComponent
2021-06-16 15:46:10 -07:00
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
2a6009c94b
Cleanup OnDisconnect client case slightly
2021-06-15 17:46:51 -07:00
cf5641a211
Cleanup shutdown, activate and deactivate for MPSystemComponent
2021-06-15 14:53:23 -07:00
2eca923694
Rework session validation to work through Connect packet
2021-06-15 14:34:24 -07:00
adc09435f4
Cleanup validation failure logic
2021-06-15 11:08:59 -07:00
04bf6c3689
Separate out session validation into its own packet
2021-06-15 10:14:02 -07:00
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
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
hultonha
Chris Galvan
SergeyAMZN
pereslav
Steve Pham
AMZN-Olex
Gene Walters
puvvadar
Mike Balfour
mbalfour
AMZN-puvvadar
Gene Walters
nvsickle