birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,645 Commits 3 Branches 3 Tags
ff862a2f206aa2449e4c7ee77d2914b091103086
Commit Graph

143 Commits

Author SHA1 Message Date
Gene Walters 0bd86cf0a4 small edit: removing pragma optimize offs 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-20 14:58:09 -08:00
Gene Walters fe5aeb9a5f Merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-10 19:41:36 -08:00
Gene Walters 5d5087e0d3 Moving CommunicatorTracePrinter to a place that AP and Multiplayer gem can use it. MultiplayerEditorSystemComponent now watching the server process and pumping the trace printer. Wip; for some reason not all the server logs are reaching the editor 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-09 11:11:15 -08:00
kberg-amzn 479ff188a0 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-05 15:05:23 -07:00
kberg-amzn 8a3d055f8b Some cleanup around handling of migrations to simplify interfaces and add additional hooks for functionality 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-03 19:34:10 -07:00
kberg-amzn 5b734b9d41 A number of fixes to timeout and disconnect handling 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-03 14:17:20 -07:00
Gene Walters 6ef6164ad8 merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-22 17:00:47 -07:00
kberg-amzn 15fbe97504 Adding a guard for this, since tests attempt to apply autonomy to an invalid entity 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-21 17:12:08 -07:00
kberg-amzn 7b77961962 removing unused local variable causing a compiler warning 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-21 16:52:11 -07:00
kberg-amzn 79b41686c4 Merging latest dev 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-21 10:11:37 -07:00
SergeyAMZN 2971dc9a3e Merge pull request #4425 from aws-lumberyard-dev/NetHierarchyInput 
Network hierarchy input processing
 2021-10-20 13:18:12 +01:00
Gene Walters 41e85b5899 Merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-19 16:21:38 -07:00
Gene Walters 580153b16e Adding EditorPython methods to Multiplayer gem for launching the editor gamemode with a server. Adding a test for networkinput with scriptcanvas to ensure the autonomous client can create input and that the server can receive and process the input via script canvas. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-18 21:47:40 -07:00
Vincent Liu a534fccc9b Expose matchmaking event polling APIs and add required session notifications (#4636) 
* Expose matchmaking event polling APIs and add required session notifications

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-10-18 12:47:55 -07:00
kberg-amzn 3040f74c41 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-14 19:17:10 -07:00
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
kberg-amzn 4449e83c3b Further fixes to get client migrations functional, plus a bug fix from the netBindComponent lookup optimization 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-08 21:27:31 -07:00
pereslav 08b1529da8 Merge from development 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-08 21:27:55 +01:00
kberg-amzn 18340f2b1b Changes to get client migration partially functional 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-06 18:57:45 -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
pereslav a58325e691 Enabled multi-entities player prefabs. Added updating replication set for hierarchy children. PR feedback addressing 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-07 00:38:07 +01: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 bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-01 15:04:50 -07:00
puvvadar 0a6ddfab5e Revert optimization change in favor of another PR 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-01 11:02:12 -07:00
kberg-amzn 865ed60007 merging latest dev 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-01 09:53:16 -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
Artur K f44169f7fa Cleanup SerializeContext.h pt.1 (#4264) 
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-09-29 11:31:01 -05:00
kberg-amzn 02bc89cd92 Fixes to sending entity updates and entity rpcs within an environment set up for cross host entity migration 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-28 19:25:04 -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 aacb6a18db Hook up the last client inputId to the migrate notification 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 19:41:23 -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 011bd5d10e merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:28:57 -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 bc8ccde318 Merge branch 'development' of https://github.com/o3de/o3de into mp_blending_cleanup 2021-09-17 15:03:43 -07:00
puvvadar c5d8c194df Cleaning up NetworkTime and reworking how we approach network interpolation 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-02 14:24:46 -07:00
kberg-amzn b1faad8406 Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats 2021-08-30 12:06:45 -07:00
kberg-amzn 99d71cfbc5 Added delta replication and stat tracking to vector and array network property container types, + some minor cleanup I ran into when looking for the best hook points for this functionality 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-08-30 12:05:53 -07:00
puvvadar a5d9e2e22d Merge pull request #3434 from aws-lumberyard-dev/mp_custom_handshake 
Move packet dispatch to return an enum that includes a pending option
 2021-08-30 10:18:35 -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
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 14:51:35 -07:00
Esteban Papp ea2f74dc0f more fixes for Gems 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 14:51:12 -07:00
SergeyAMZN 5bc46fc676 Merge pull request #2639 from aws-lumberyard-dev/nvsickle/NetworkingActivationOrder 
Ensure network autonomy gets set before entity activation
 2021-08-20 14:09:30 +01:00
pappeste 9052764980 Multiplayer 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:14 -07:00
kberg-amzn 976654e809 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-08-03 13:15:59 -07:00
kberg-amzn e0d0bbfdae Changes to desync debug output to make it less stressful on bandwidth and the server, as well as some fixes to corrections on the local client 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-08-03 13:12:37 -07:00