Commit Graph

442 Commits

Author SHA1 Message Date
Gene Walters b81bf1064f Noticing the Jenkins machine fails to connect to server before the server logs even begin. Giving the server some time (5 seconds) to boot up before trying to connect to see if that helps
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-20 23:33:22 -07:00
Gene Walters 322e339543 Printing error if the editor server launcher has not been built. Updating pytest to fail if the serverlauncher does not exist.
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-20 11:45:42 -07: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 5e8b6da8b2 Ensure editor server launches with the same render hardware interface as the editor. This way when Automated Review runs the Multiplayer tests with the headless editor, by default the server launcher will also be headless (rhi=null). Also added a cvar to override the default rhi (editorsv_rhi_override); this way if you're in the normal editor with a gui, you can launch a headless server
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-19 15:04:46 -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
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
Stephen Tramer 396edd22fb Merge pull request #4461 from aws-lumberyard-dev/LYN-7080_FixEditorServerConnectionRaceCondition
Fix EditorServer Connection
2021-10-08 11:07:52 -07:00
AMZN-Olex ecd358a53e Cleaning up
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-07 12:56:44 -04:00
AMZN-Olex a114077e72 Final touches on the first pass of imgui hierarchy debugger
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-07 12:53:33 -04:00
AMZN-Olex 77c23b6c8f Hierarchy imgui debugger, first take
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-07 08:27:48 -04:00
Gene Walters 7e6d35b046 small fix to include using <>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-06 20:11:29 -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 50fe8bc04d pass in AZ::Utils::GetProjectPath().c_str() directly since converting projectpath is not needed
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-06 16:35:21 -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
kberg-amzn 5acb360fbb Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup
Migration fixup
2021-10-04 13:50:28 -07:00
kberg-amzn 66ab15a4b6 Removing old EntityReplicationManager.h that got re-added, this has been moved to public includes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-04 09:39:35 -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
AMZN-Olex 65b82b41d6 Added unittest for an activation test
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-01 17:56:32 -04: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
AMZN-Olex bd0f5a1746 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 2021-09-30 18:22:23 -04:00
lumberyard-employee-dm 816a623c97 Added missing EntityId.h include to FocusModeInterface.h (#4396)
* Added missing EntityId.h include to FocusModeInterface.h

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

* Non-unity build fix

Adding missing BehaviorContext.h includes to Multiplayer Gem

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

* Added missing BehaviorContext.h include to NetworkCharacterComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 17:49:02 -05: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
AMZN-Olex 94b320c967 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 2021-09-29 08:31:30 -04: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 95d7cc7212 Adding the NetworkConnectionComponent to hold user nonce and migration values for a backup host in case the current host crashes or abnormally disconnects
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 12:14:41 -07:00
puvvadar 33029945cb Merge branch 'development' of https://github.com/o3de/o3de into mp_autogen_move 2021-09-27 10:41:53 -07:00
AMZN-Olex 1765934281 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 2021-09-27 07:37:54 -04:00
kberg-amzn 2c19abf7ee Merge pull request #4287 from aws-lumberyard-dev/LYN6657_MultiplayerScriptImprovementsForDemo
LYN6657 Misc Improvements for Multiplayer Scripting
2021-09-24 14:11:14 -07:00
SergeyAMZN 66a875bf79 Merge pull request #4261 from aws-lumberyard-dev/MPSpawnableHolderUpdate
Updated NetworkSpawnableHolderComponent to use TransformBus instead o…
2021-09-24 19:06:21 +01:00
puvvadar 5114c2e0f2 Move AutoComponent jinjas to Include and update cmake accordingly
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-24 09:49:46 -07:00
pereslav bf1ebea202 Moved local variable to a smaller scope
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 17:12:58 +01:00
pereslav 44c8ae2872 Changed NetworkSpawnableHolderComponent to use Entity::GetTransform instead of an ebus call
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 13:03:02 +01:00
kberg-amzn f837f0494b many bug fixes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-23 18:25:46 -07:00
Gene Walters e91353143f Merge branch 'upstream/development' into LYN6657_MultiplayerScriptImprovementsForDemo 2021-09-23 16:35:56 -07:00
AMZN-Olex 40286b7bac A small optimization
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-23 17:37:39 -04:00
Gene Walters a44af20f9a Adding parameter names to NetworkCharacterComponent script events so people know what the parameters are used for in scriptcanvas
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 13:01:34 -07:00
puvvadar f142e30da6 Fix AutoGen of RPCs with no params
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-23 12:56:46 -07:00
Gene Walters cd85df35b6 Make sure Multiplayer AutoComponents dont generate property OnChange script events if GenerateEventBindings is disabled
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 12:45:44 -07:00
Gene Walters c2c18f094b Exposing NetworkCharacterComponent::TryMoveWithVelocity to script. Updating Multiplayer AutoComponent baseclass behavior context to Reflect itself instead of its derived (human made) component. This is so the derived class can also create behaviorcontext classes of its own if needed. Misc copyright header edit.
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 09:46:55 -07:00
AMZN-Olex 3c46336ab0 NetTransform replicates local transform for child entities
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-23 10:25:14 -04:00
pereslav 1087498d00 Merge branch 'development' of https://github.com/o3de/o3de into MPSpawnableHolderUpdate 2021-09-23 12:41:41 +01:00
pereslav ae2525564d Updated NetworkSpawnableHolderComponent to use TransformBus instead of FindComponent. Added dependency on TransformService
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-22 13:29:55 +01:00
AMZN-Olex cb75607106 Merged dev
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-22 08:09:53 -04:00