fa32940205
Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor)
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
2f38873e03
Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
6d673643be
Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
013beafe7e
Minor code warning grammar fix
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
e6650f1ff4
LYN-7655 Fix Race Condition When Launching at Editor-Server ( #4946 )
...
* Fix a race condition where the editor tries to connect to the editor-server before the editor-server is ready (originally discovered on lower-spec Jenkin machines). Change editor-server so that editor waits to receive a EditorServerReadyForInit before trying to send all the level data.
* The editor might not be the connector so make sure to connect to the actual MP simulation even if the editor isn't the editor-server connect (if editorsv_launch=true then the editor-server will connect to the editor)
* Adding warnings if MPEditorConnection cannot find certain cvars
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
eabfed5562
Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs
4 years ago
b4865e32f5
Minor whitespace fix
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
fe071f0736
Adding warnings if MPEditorConnection cannot find certain cvars
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
03e90e7df5
Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs
4 years ago
7de5c17fb6
The editor might not be the connector so make sure to connect to the actual MP simulation even if the editor isn't the editor-server connect (if editorsv_launch=true then the editor-server will connect to the editor)
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
ea4a898d74
Minor, adding some null checks
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
5ade5291b0
Minor code comment edit
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
569dbc7db3
Merge editor-server race condition fix; will test on Jenkins
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
0c5110b1ed
Fix a race condition where the editor tries to connect to the editor-server before the editor-server is ready (originally discovered on lower-spec Jenkin machines). Change editor-server so that editor waits to receive a EditorServerReadyForInit before trying to send all the level data.
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
6b102cadac
Removing hacked Jenkins fix in order to rerun with more logging and get a better idea of why its failing in the first place
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
3a1c377c03
Fix compiler warning
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
7e6d35b046
small fix to include using <>
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
b464ff966c
merging latest dev + resolving 1 merge conflict
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
50fe8bc04d
pass in AZ::Utils::GetProjectPath().c_str() directly since converting projectpath is not needed
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
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>
4 years ago
170a32d667
Merge latest to mp_handshake_conndata
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
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>
4 years ago
2811a84187
Move did handshake logic to connection data plus an optimization
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
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>
4 years ago
b1faad8406
Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats
4 years ago
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>
4 years ago
ebbe4b99a4
Add const to some funcs and fix a comment
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
decf15df21
Move packet dispatch to return an enum that includes a pending option
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
115f669679
Rename timeout functions for readability
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
07e2bea1fe
Add connection interface timeout config and remove Ctrl+G timer
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
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
5 years ago
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>
5 years ago
074518454c
Merge branch 'development' into cmake/SPEC-7179
5 years ago
9b0316132c
Gems/Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
a48a0d1f8a
Fix positional desync of network objects plus related log spam
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
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>
5 years ago
1100e20e26
Merged ctrl+g fixes from MultiplayerEditorFixes
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
5 years ago
ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
...
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago
6b1d3d1f9a
SPEC-7469 Multiplayer Editor Ctrl+G fails due to EditorInfo packets reordering. SPEC-7471 Multiplayer Editor Ctrl+G asserts after CreateEntitiesImmediate
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago
04387be083
Remove some redundant includes, forward declares and similar pieces
5 years ago
a748c2e152
Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking
5 years ago
bffb7d1b28
Simplified the change to rely on sv_port cvar
5 years ago
Gene Walters
Gene Walters
puvvadar
kberg-amzn
Esteban Papp
Steve Pham
Chris Galvan
pereslav
SergeyAMZN