Commit Graph

64 Commits

Author SHA1 Message Date
Vincent Liu 6823ea2274 Add GameLift matchmaking backfill server support (#4622)
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
2021-10-13 16:59:37 -07:00
Gene Walters b464ff966c merging latest dev + resolving 1 merge conflict
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-06 16:53:25 -07:00
Gene Walters d36041d1b7 Update based on feedback. Adding event to MPSystemComponent for receiving a server acceptance packet. The editor system component subscribes to this event and tells the server we're ready for entity updates
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-06 15:48:54 -07:00
puvvadar 170a32d667 Merge latest to mp_handshake_conndata
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-10-04 13:58:09 -07:00
Gene Walters 73891c71b7 Fix EditorServer connection by ensuring that SendReadyForEntityUpdates is only called after a handshake is finished and the editor has accepted the editorserver's connection. Also allow engine-centric projects to use editor-server by passing in the project-path when launching the editor-server. Also allow devs to set sv_defaultPlayerSpawnAsset from inside the editor and it'll be used by the editor-server
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-03 22:49:13 -07:00
kberg-amzn 8d993494f6 Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-30 22:53:51 -07:00
puvvadar 2811a84187 Move did handshake logic to connection data plus an optimization
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-30 19:59:34 -07:00
kberg-amzn 0a829f9661 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 15:50:22 -07:00
kberg-amzn f837f0494b many bug fixes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-23 18:25:46 -07:00
kberg-amzn d28bcbe027 Reverts changes to component application and adds further client migration handling hookup
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-21 19:33:59 -07:00
kberg-amzn 6e84495975 Changes to make client and entity migration functional, needed in the event of a host quitting necessitating a host migration
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-17 16:48:16 -07:00
puvvadar ebbe4b99a4 Add const to some funcs and fix a comment
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-25 10:21:29 -07:00
puvvadar decf15df21 Move packet dispatch to return an enum that includes a pending option
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-24 16:19:38 -07:00
puvvadar 318fee8e22 Fix tabs
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-30 10:38:15 -07:00
puvvadar 8612d7bce2 Fix incorrect blending math
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-29 13:35:32 -07:00
puvvadar 496a0f686f Merge branch 'development' of https://github.com/o3de/o3de into mp_lerp_jitter 2021-07-29 09:58:07 -07:00
kberg-amzn 6839497d99 Corrects math computing blend factors to interpolate state between received network updates
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-07-28 12:31:19 -07:00
puvvadar 08a53a3a6f Merging development to mp_lerp_jitter
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-22 14:12:14 -07:00
puvvadar ebe326f6e9 Add server side accounting for blend factor
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-20 14:12:06 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
puvvadar a48a0d1f8a Fix positional desync of network objects plus related log spam
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-12 11:15:38 -07:00
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Steve Pham 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
AMZN-Olex d7bfd34a67 IFilterEntityManager work
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-06-30 19:18:06 -04:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
puvvadar 632d774d4c Add disconnect type param to Terminate 2021-06-23 11:44:21 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
puvvadar 55f5e9f0ae Remove unnecessary forward declare 2021-06-22 09:25:29 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -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
puvvadar 2eca923694 Rework session validation to work through Connect packet 2021-06-15 14:34:24 -07:00
puvvadar 04bf6c3689 Separate out session validation into its own packet 2021-06-15 10:14:02 -07:00
puvvadar cd5867d2fa Cleanup session changes and add on connection disconnected event 2021-06-08 16:43:36 -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
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
karlberg 14bc0ba8ac Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-06-02 14:57:00 -07:00
karlberg 802943bbb3 Bug fixes, naming changes to make variables more clear, and adds a cvar to adjust client window size 2021-05-27 19:54:56 -07:00
Gene Walters b5a0df00e1 Hosts which are not a dedicated server (meaning they also play the game) will spawn a default player for themselves 2021-05-25 17:21:03 -07:00
karlberg 6a643392f0 Merging latest main 2021-05-19 13:37:45 -07:00
karlberg 487e989e68 Several updates to complete rewind support and remove unneeded functionality 2021-05-19 13:27:24 -07:00
puvvadar e2ade654fb Address misc feedback 2021-05-18 13:52:28 -07:00
puvvadar 920f85981d Add another missed header file 2021-05-17 18:55:00 -07:00
puvvadar cb55eaf853 Merge main to mp_editor_pipeline 2021-05-16 11:36:47 -07:00
puvvadar fb51829360 Resolve MP Gem Ctrl+G changes with main 2021-05-15 13:12:16 -07:00
karlberg 5acdc40595 Many fixes for external gem multiplayer components and component network inputs, fixes an uninitialized variable resulting in continual desyncs, restructures our public includes to match the directory structure of source, allows autogen artefacts to be included by external gems, allowing for external multiplayer components to interact with multiplayer gem components with no extra code 2021-05-14 14:24:33 -07:00