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
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
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
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
7e6d35b046
small fix to include using <>
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-06 20:11:29 -07:00
b464ff966c
merging latest dev + resolving 1 merge conflict
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-06 16:53:25 -07:00
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
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
170a32d667
Merge latest to mp_handshake_conndata
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-10-04 13:58:09 -07:00
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
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
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
b1faad8406
Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats
2021-08-30 12:06:45 -07:00
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
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
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
115f669679
Rename timeout functions for readability
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-08-02 20:31:02 -07:00
07e2bea1fe
Add connection interface timeout config and remove Ctrl+G timer
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-08-02 17:41:09 -07:00
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
2021-07-16 15:42:37 -07:00
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
074518454c
Merge branch 'development' into cmake/SPEC-7179
2021-07-15 16:58:58 -07:00
9b0316132c
Gems/Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 16:55:00 -07:00
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
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05: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
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
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
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-23 15:29:31 +01: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
bffb7d1b28
Simplified the change to rely on sv_port cvar
2021-06-03 01:20:22 +01:00
3b519c6475
removed whitespace
2021-06-03 01:06:15 +01:00
c752b9d0fc
Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts
2021-06-03 01:04:01 +01:00
2452149e7d
Add RPC Events plus reflection plus fix Ctrl+G retry
2021-05-19 19:34:48 -07:00
350e5a0cd2
Update to const auto&
2021-05-18 15:22:22 -07:00
e2ade654fb
Address misc feedback
2021-05-18 13:52:28 -07:00
e03645f816
Disable editorsv launch by default
2021-05-18 10:48:39 -07:00
19316e422b
Check launch process exists before waiting for 15 seconds
2021-05-18 10:46:18 -07:00
cf4e04ba57
Cleanup a few more headers
2021-05-17 18:52:40 -07:00
93e267345f
Address string/mem feedback plus some misc cleanup
2021-05-17 18:46:21 -07:00
0d9b55bff2
Move static buffer to member to prevent potential memory issues
2021-05-17 16:48:05 -07:00
83a56ce71c
Cleanup typo
2021-05-17 12:53:15 -07:00
f94d0c99e7
Cleanup connection order slightly
2021-05-17 09:58:58 -07:00
0e53c77516
Fix some include paths
2021-05-15 13:47:03 -07:00
fb51829360
Resolve MP Gem Ctrl+G changes with main
2021-05-15 13:12:16 -07:00
1915b97c16
Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side
2021-05-15 12:58:30 -07:00
8a39f9f1b4
Streamline MP Ctrl+G logic via MultiplayerEditorConnection
2021-05-13 15:31:37 -07:00
Gene Walters
puvvadar
kberg-amzn
Esteban Papp
Steve Pham
Chris Galvan
pereslav
SergeyAMZN