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

166 Commits

Author SHA1 Message Date
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 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
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
Gene Walters 928cfcf1e5 Removing an accidental pragma once 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-19 09:49:56 -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
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
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
kberg-amzn 18340f2b1b Changes to get client migration partially functional 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-06 18:57:45 -07:00
Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 16:55:58 -07:00
Gene Walters b464ff966c merging latest dev + resolving 1 merge conflict 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 16:53:25 -07:00
pereslav a58325e691 Enabled multi-entities player prefabs. Added updating replication set for hierarchy children. PR feedback addressing 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-07 00:38:07 +01:00
Gene Walters d36041d1b7 Update based on feedback. Adding event to MPSystemComponent for receiving a server acceptance packet. The editor system component subscribes to this event and tells the server we're ready for entity updates 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 15:48:54 -07:00
Gene Walters 26079f7350 Update based on feedback. Adding event to MPSystemComponent for receiving a server acceptance packet. The editor system component subscribes to this event and tells the server we're ready for entity updates 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 15:44:43 -07:00
pereslav 801e54c599 Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchyInput 2021-10-05 15:53:39 +01:00
AMZN-Olex d05d5d1e97 Hierarchy components optimizations 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-05 08:31:23 -04:00
Olex Lozitskiy 52d3e4c601 [SIG-Network] Google benchmarks for network hierarchy components. 
First google benchmarks for hierarchy components.
 2021-10-05 08:23:14 -04:00
kberg-amzn eb2470fe38 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-04 16:59:57 -07:00
kberg-amzn c1c8709206 Fix 3-way replication for when an object migrates in rapid succession 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-04 16:57:21 -07:00
puvvadar 170a32d667 Merge latest to mp_handshake_conndata 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-04 13:58:09 -07:00
kberg-amzn 5acb360fbb Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup 
Migration fixup
 2021-10-04 13:50:28 -07:00
AMZN-Olex 3321f9e5ea First google benchmarks for hierarchy logic. 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-04 09:00:20 -04:00
pereslav 64068991ed Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchyInput 2021-10-02 23:46:17 +01:00
kberg-amzn bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-01 15:04:50 -07:00
kberg-amzn 865ed60007 merging latest dev 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-01 09:53:16 -07:00
kberg-amzn 8d993494f6 Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-30 22:53:51 -07:00
puvvadar f6638420f0 Formatting fix up 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-30 20:02:38 -07:00
puvvadar 2811a84187 Move did handshake logic to connection data plus an optimization 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-30 19:59:34 -07:00
pereslav ef3552df69 First pass for network hierarchy input processing 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-01 00:07:23 +01:00
AMZN-Olex 94b320c967 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 2021-09-29 08:31:30 -04:00
kberg-amzn 02bc89cd92 Fixes to sending entity updates and entity rpcs within an environment set up for cross host entity migration 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-28 19:25:04 -07:00
kberg-amzn 0a829f9661 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-27 15:50:22 -07:00
puvvadar 33029945cb Merge branch 'development' of https://github.com/o3de/o3de into mp_autogen_move 2021-09-27 10:41:53 -07:00
AMZN-Olex 1765934281 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 2021-09-27 07:37:54 -04:00
Gene Walters 8c4ff8802c Small fix to use AZ_CRC_CE 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-24 13:25:33 -07:00
puvvadar 93761a754b Merge branch 'development' of https://github.com/o3de/o3de into mp_autogen_move 2021-09-24 09:51:49 -07:00
puvvadar 5114c2e0f2 Move AutoComponent jinjas to Include and update cmake accordingly 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-24 09:49:46 -07:00
kberg-amzn f837f0494b many bug fixes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-23 18:25:46 -07:00
Gene Walters e91353143f Merge branch 'upstream/development' into LYN6657_MultiplayerScriptImprovementsForDemo 2021-09-23 16:35:56 -07:00
Gene Walters c2c18f094b Exposing NetworkCharacterComponent::TryMoveWithVelocity to script. Updating Multiplayer AutoComponent baseclass behavior context to Reflect itself instead of its derived (human made) component. This is so the derived class can also create behaviorcontext classes of its own if needed. Misc copyright header edit. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-23 09:46:55 -07:00
AMZN-Olex 3c46336ab0 NetTransform replicates local transform for child entities 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-23 10:25:14 -04:00