Commit Graph

586 Commits (4ca71fd96a9ca8578b65ef9f3a2dd8f235aa8ffe)

Author SHA1 Message Date
Gene Walters ff862a2f20 Fix memory leak of ProcessWatcher
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 0bd86cf0a4 small edit: removing pragma optimize offs
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 02590a1766 AzCoreLogSink will check if it's running in an editor-server and will allow stdouts
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 6005a4e08b Merging last dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Olex Lozitskiy e804fd2a42
Refactored away circular dependencies in Multiplayer gem cmake targets. 4 years ago
Olex Lozitskiy 89f4ebb298 Refactored away circular dependencies in Multiplayer gem.
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
Gene Walters 4d161f42df WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
SergeyAMZN f9824fc4ee
Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix
Fixed IMGUI Entity Outliner to show net entities
4 years ago
amzn-sean 38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.

* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
 - updated parts to use the time conversion functions.
 - in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Sergey Pereslavtsev 3fb97b1334 Added more info to comment
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Sergey Pereslavtsev 435f839666 Fixed IMGUI Entity Outliner to show net entities
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters fe5aeb9a5f Merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters d6803d800b Externed cvars dont get registered with setreg (not sure why). Updating sv_defaultPlayer to grab the variable via console string lookup instead so the proper value is gathered
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
SergeyAMZN b9f6d1ec9f
Merge pull request #5311 from aws-lumberyard-dev/HierarchiesFixes
Fixed client hierarchy construction to check for authority instead of controller
4 years ago
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>
4 years ago
Sergey Pereslavtsev 7fce5e52a4 PR feedback addressing
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Sergey Pereslavtsev 1e6518abab Build fix after the merge from dev
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
puvvadar 4468a9213d
Merge pull request #5359 from aws-lumberyard-dev/LYN-8035_MultiplayerFlakyTest_ServerLogging
Wait to Activate Editor-server Until the Logging System is Ready
4 years ago
Sergey Pereslavtsev 32f72a1213 Merge from development
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
kberg-amzn 479ff188a0 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Gene Walters 384d631485 Switch to use the new ComponentApplicationLifecycle system to listen for legacy systems to be ready
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Sergey Pereslavtsev 807d0d7a5a Fixed hierarchies migration. Fixed assert with invalid entity bounds
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters 3973a59d77 Wait to activate the editor-server until CrySystemInitialized so that the logging system is ready. Automated testing listens for these logs
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
kberg-amzn ed06ef7ed2 Removing ITimeoutHandler to simplify timeout queue interface, removes some unneeded code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Sergey Pereslavtsev 54c1b00902 Fixed AR nightly for non-prefab levels where MultiplayerEditorSystemComponent prints an error
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Sergey Pereslavtsev 2b2e5c6367 Fixed client hierarchy construction to check for authority instead of controller
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
kberg-amzn 7e65104155 Addressing PR feedback
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
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>
4 years ago
kberg-amzn fda7a6353e Backing out some temporary debugging code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 5b734b9d41 A number of fixes to timeout and disconnect handling
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Sergey Pereslavtsev 2ac75d1231 Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchies2 4 years ago
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 4 years ago
Gene Walters 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
Gene Walters 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
Adi Bar-Lev 0ee7ab9df5 Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE 4 years ago
Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 013beafe7e Minor code warning grammar fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Sergey Pereslavtsev 9109b9de8d Removed includes
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Sergey Pereslavtsev 43e6731714 Removed hierarchy validation since it is not always applicable
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Sergey Pereslavtsev 348bb7d37e Added setreg option for network spawnables serialization format
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters 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
AMZN-Olex 250a91dd96 Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
Sergey Pereslavtsev dc336ffaba Added validation to net prefab processing to error if there are hierarchical entities without Net hierarchy components
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters eabfed5562 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 4 years ago
Gene Walters b4865e32f5 Minor whitespace fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters fe071f0736 Adding warnings if MPEditorConnection cannot find certain cvars
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 03e90e7df5 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 4 years ago
Gene Walters 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
Gene Walters ea4a898d74 Minor, adding some null checks
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 5ade5291b0 Minor code comment edit
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 5ba090feec Merge branch 'upstream/development' into LYN-7655_MultiplayerEditorToEditorServerConnectionReverse 4 years ago
Gene Walters 6ef6164ad8 merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 569dbc7db3 Merge editor-server race condition fix; will test on Jenkins
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 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
Olex Lozitskiy 775dda8ed2
NetBindComponent::SetOwningConnectionId is for a hierarchy based on its root's network entity
- for hierarchies, on both servers and clients NetBindComponent::SetOwningConnectionId is set for the all involved entities based on the root entity owning connection id
- added new unit tests to cover these scenarios
- all unit tests pass, hierarchy benchmarks remain unaffected
4 years ago
AMZN-Olex a2592e9ff8 Correction in set hierarchy entity logic.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
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>
4 years ago
kberg-amzn 7b77961962 removing unused local variable causing a compiler warning
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 4cd6ce1e96 Fixing broken include path
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
AMZN-Olex 317bb7aa67 Owning connection id will happen on clients as well.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
AMZN-Olex 37873f81cf Setting owning connection id based on the hierarchy root network entity.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
kberg-amzn 79b41686c4 Merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Gene Walters 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
Gene Walters 3a1c377c03 Fix compiler warning
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
Olex Lozitskiy 9e2eba2829
Network Hierarchy optimizations for rebuilding hierarchies
- reworked recursive rebuilding to iterative breadth first method
- some minor optimization here and there
4 years ago
AMZN-Olex 9e4a39f9ed Hierarchy code enhancements
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
SergeyAMZN 2971dc9a3e
Merge pull request #4425 from aws-lumberyard-dev/NetHierarchyInput
Network hierarchy input processing
4 years ago
Sergey Pereslavtsev 8e520c8db8 PR feedback
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters 41e85b5899 Merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
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>
4 years ago
pereslav 62971fa7bd PR feedback, removed unnecessary code
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
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>
4 years ago
AMZN-Olex ceb9b7afd7 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/hierarchy_optimizations_cr 4 years ago
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>
4 years ago
kberg-amzn e6290436fc Updates mocks for interface changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 47a00e9801 Missed one more printf
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn e2a2ecff44 missed a printf
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 3a0805254b Fixes for 64-bit printfs
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
pereslav 05493b538f Added tracking of hierarchy root ownership when hierarchies are migrated
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
kberg-amzn 3040f74c41 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn a6e7a81b79 More fixes to migration, plus some quality of life fixes to TimeoutQueue to allow lambda based handlers and a quick fix to OctreeSystemComponent to more gracefully handle enumerate calls that lie outside the vis system bounds
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
pereslav b1a76feead Added tests. Made network spawnable to serialize in binary
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
Vincent Liu 6823ea2274
Add GameLift matchmaking backfill server support (#4622)
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
kberg-amzn 05e8b2941a Removing unused member, simplify API
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
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>
4 years ago
pereslav 08b1529da8 Merge from development
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
pereslav 0c2c042fde Fixed crash in ConstEntityHandle. Added hierarchical correction data serialization
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
Stephen Tramer 396edd22fb
Merge pull request #4461 from aws-lumberyard-dev/LYN-7080_FixEditorServerConnectionRaceCondition
Fix EditorServer Connection
4 years ago
AMZN-Olex 065e0635d4 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/hierarchy_optimizations_cr 4 years ago
AMZN-Olex ecd358a53e Cleaning up
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
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>
4 years ago
pereslav cb53389004 Added validation into input processing
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
pereslav 28a40fa4df Added look up of the child entities when processing input to make sure the entity still exists
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
AMZN-Olex 77c23b6c8f Hierarchy imgui debugger, first take
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
Gene Walters 7e6d35b046 small fix to include using <>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
kberg-amzn 18340f2b1b Changes to get client migration partially functional
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Gene Walters b464ff966c merging latest dev + resolving 1 merge conflict
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
pereslav a58325e691 Enabled multi-entities player prefabs. Added updating replication set for hierarchy children. PR feedback addressing
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago