Commit Graph

701 Commits

Author SHA1 Message Date
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>
2021-11-05 12:23:00 -07:00
Sergey Pereslavtsev 807d0d7a5a Fixed hierarchies migration. Fixed assert with invalid entity bounds
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-11-05 17:32:16 +00:00
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>
2021-11-04 18:37:15 -07:00
kberg-amzn ed06ef7ed2 Removing ITimeoutHandler to simplify timeout queue interface, removes some unneeded code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-04 16:48:39 -07:00
kberg-amzn dedb367e9a Remove lots of mock interface code duplication
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-04 16:29:41 -07:00
kberg-amzn 97e10d8210 Fix mock and benchmark interfaces
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-04 16:27:05 -07:00
Sergey Pereslavtsev 54c1b00902 Fixed AR nightly for non-prefab levels where MultiplayerEditorSystemComponent prints an error
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-11-04 14:55:03 +00:00
Sergey Pereslavtsev 2b2e5c6367 Fixed client hierarchy construction to check for authority instead of controller
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-11-04 14:52:35 +00:00
kberg-amzn 7e65104155 Addressing PR feedback
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-03 19:40:20 -07:00
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>
2021-11-03 19:34:10 -07:00
kberg-amzn fda7a6353e Backing out some temporary debugging code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-03 14:20:56 -07:00
kberg-amzn 5b734b9d41 A number of fixes to timeout and disconnect handling
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-03 14:17:20 -07:00
Sergey Pereslavtsev 2ac75d1231 Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchies2 2021-11-03 13:58:50 +00:00
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 2021-11-01 20:23:27 -07:00
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>
2021-11-01 13:01:59 -07:00
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>
2021-10-29 13:55:32 -07:00
Adi Bar-Lev 0ee7ab9df5 Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:28 -04:00
Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:56:01 -07:00
Gene Walters b324b3a1a9 Minor code comment grammar change
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:17 -07:00
Gene Walters 013beafe7e Minor code warning grammar fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:15 -07:00
Sergey Pereslavtsev 9109b9de8d Removed includes
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 15:19:11 +01:00
Sergey Pereslavtsev 43e6731714 Removed hierarchy validation since it is not always applicable
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 15:17:11 +01:00
Sergey Pereslavtsev 348bb7d37e Added setreg option for network spawnables serialization format
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 13:49:08 +01:00
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>
2021-10-27 10:38:09 -07:00
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>
2021-10-26 19:10:46 -04:00
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>
2021-10-26 16:10:35 +01:00
Gene Walters eabfed5562 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 2021-10-25 14:15:05 -07:00
Gene Walters b4865e32f5 Minor whitespace fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-25 13:04:20 -07:00
Gene Walters fe071f0736 Adding warnings if MPEditorConnection cannot find certain cvars
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-25 12:57:40 -07:00
Gene Walters 03e90e7df5 Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs 2021-10-24 23:09:21 -07:00
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>
2021-10-24 23:07:58 -07:00
Gene Walters ea4a898d74 Minor, adding some null checks
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-23 19:30:51 -07:00
Gene Walters 5ade5291b0 Minor code comment edit
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-22 17:13:44 -07:00
Gene Walters 5ba090feec Merge branch 'upstream/development' into LYN-7655_MultiplayerEditorToEditorServerConnectionReverse 2021-10-22 17:01:58 -07:00
Gene Walters 6ef6164ad8 merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-22 17:00:47 -07:00
Gene Walters 569dbc7db3 Merge editor-server race condition fix; will test on Jenkins
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-22 16:39:04 -07:00
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>
2021-10-22 16:34:42 -07:00
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
2021-10-22 11:09:30 -04:00
AMZN-Olex a2592e9ff8 Correction in set hierarchy entity logic.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-22 09:43:52 -04:00
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>
2021-10-21 17:12:08 -07:00
kberg-amzn 7b77961962 removing unused local variable causing a compiler warning
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 16:52:11 -07:00
kberg-amzn 214a2899ad oops =(
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 16:41:01 -07:00
kberg-amzn 2df466228a fixing one more broken include
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 15:58:01 -07:00
kberg-amzn 4cd6ce1e96 Fixing broken include path
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 15:38:43 -07:00
AMZN-Olex 317bb7aa67 Owning connection id will happen on clients as well.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-21 15:14:00 -04:00
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>
2021-10-21 15:09:46 -04:00
kberg-amzn 79b41686c4 Merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 10:11:37 -07:00
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>
2021-10-21 09:56:03 -07:00
Gene Walters 3a1c377c03 Fix compiler warning
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-21 06:23:51 -07:00
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