Commit Graph

609 Commits (9e2a3226fd39e1657bd47ea6a76ecfcac8931b5a)

Author SHA1 Message Date
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
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
kberg-amzn 989952e106 Fix comment
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 988561920a Sets up the event scheduler system component for hierarchy tests
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
kberg-amzn dedb367e9a Remove lots of mock interface code duplication
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 97e10d8210 Fix mock and benchmark interfaces
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>
5 years ago
Gene Walters b324b3a1a9 Minor code comment grammar change
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 013beafe7e Minor code warning grammar fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Sergey Pereslavtsev 9109b9de8d Removed includes
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
5 years ago
Sergey Pereslavtsev 43e6731714 Removed hierarchy validation since it is not always applicable
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
5 years ago
Sergey Pereslavtsev 348bb7d37e Added setreg option for network spawnables serialization format
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
5 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>
5 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>
5 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>
5 years ago
Gene Walters eabfed5562 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 5 years ago
Gene Walters b4865e32f5 Minor whitespace fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters fe071f0736 Adding warnings if MPEditorConnection cannot find certain cvars
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 03e90e7df5 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 5 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>
5 years ago
Gene Walters ea4a898d74 Minor, adding some null checks
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 5ade5291b0 Minor code comment edit
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 5ba090feec Merge branch 'upstream/development' into LYN-7655_MultiplayerEditorToEditorServerConnectionReverse 5 years ago
Gene Walters 6ef6164ad8 merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 569dbc7db3 Merge editor-server race condition fix; will test on Jenkins
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 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>
5 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
5 years ago
AMZN-Olex a2592e9ff8 Correction in set hierarchy entity logic.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
5 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>
5 years ago
kberg-amzn 7b77961962 removing unused local variable causing a compiler warning
Signed-off-by: kberg-amzn <karlberg@amazon.com>
5 years ago
kberg-amzn 214a2899ad oops =(
Signed-off-by: kberg-amzn <karlberg@amazon.com>
5 years ago