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
b324b3a1a9
Minor code comment grammar change
...
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
214a2899ad
oops =(
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn
2df466228a
fixing one more broken include
...
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
kberg-amzn
c228e77e1c
Fixes a bunch of bad casts in hierarchy tests
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Sergey Pereslavtsev
e3a14c0809
Fixed warning about unused local variable
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
puvvadar
66c4950de0
Merge pull request #4529 from aws-lumberyard-dev/mp_deltaserializer_perf
...
Reworking DeltaSerializer to no longer require string based hashes
4 years ago
Sergey Pereslavtsev
faea65e840
Removed pragma once from cpp
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
Gene Walters
928cfcf1e5
Removing an accidental pragma once
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago