birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,238 Commits 3 Branches 3 Tags
03e90e7df5d992037fb64e60d815e009da3c5bd7
Commit Graph

490 Commits

Author SHA1 Message Date
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 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
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>
 2021-10-20 11:45:42 -07:00
Olex Lozitskiy 9e2eba2829 Network Hierarchy optimizations for rebuilding hierarchies 
- reworked recursive rebuilding to iterative breadth first method
- some minor optimization here and there
 2021-10-20 13:50:35 -04:00
AMZN-Olex 9e4a39f9ed Hierarchy code enhancements 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-20 09:30:21 -04:00
SergeyAMZN 2971dc9a3e Merge pull request #4425 from aws-lumberyard-dev/NetHierarchyInput 
Network hierarchy input processing
 2021-10-20 13:18:12 +01:00
Sergey Pereslavtsev 8e520c8db8 PR feedback 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-10-20 12:36:35 +01:00
Gene Walters 41e85b5899 Merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-19 16:21:38 -07:00
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>
 2021-10-19 15:04:46 -07:00
pereslav 62971fa7bd PR feedback, removed unnecessary code 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-19 13:52:32 +01:00
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>
 2021-10-18 21:47:40 -07:00
AMZN-Olex ceb9b7afd7 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/hierarchy_optimizations_cr 2021-10-18 22:54:06 -04:00
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>
 2021-10-18 12:47:55 -07:00
kberg-amzn e6290436fc Updates mocks for interface changes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-15 18:01:40 -07:00
kberg-amzn 47a00e9801 Missed one more printf 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-15 16:53:58 -07:00
kberg-amzn e2a2ecff44 missed a printf 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-15 14:56:06 -07:00
kberg-amzn 3a0805254b Fixes for 64-bit printfs 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-15 13:42:46 -07:00
pereslav 05493b538f Added tracking of hierarchy root ownership when hierarchies are migrated 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-15 13:13:19 +01:00
kberg-amzn 3040f74c41 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-14 19:17:10 -07:00
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>
 2021-10-14 18:22:41 -07:00
pereslav b1a76feead Added tests. Made network spawnable to serialize in binary 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-14 23:21:04 +01:00
Vincent Liu 6823ea2274 Add GameLift matchmaking backfill server support (#4622) 
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-10-13 16:59:37 -07:00
kberg-amzn 05e8b2941a Removing unused member, simplify API 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-08 21:36:54 -07:00
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>
 2021-10-08 21:27:31 -07:00
pereslav 08b1529da8 Merge from development 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-08 21:27:55 +01:00
pereslav 0c2c042fde Fixed crash in ConstEntityHandle. Added hierarchical correction data serialization 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-08 21:19:22 +01:00
Stephen Tramer 396edd22fb Merge pull request #4461 from aws-lumberyard-dev/LYN-7080_FixEditorServerConnectionRaceCondition 
Fix EditorServer Connection
 2021-10-08 11:07:52 -07:00
AMZN-Olex 065e0635d4 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/hierarchy_optimizations_cr 2021-10-08 12:22:22 -04:00
AMZN-Olex ecd358a53e Cleaning up 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-07 12:56:44 -04:00
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>
 2021-10-07 12:53:33 -04:00
pereslav cb53389004 Added validation into input processing 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-07 16:58:37 +01:00
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>
 2021-10-07 16:24:21 +01:00
AMZN-Olex 77c23b6c8f Hierarchy imgui debugger, first take 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-07 08:27:48 -04:00