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

477 Commits

Author SHA1 Message Date
Olex Lozitskiy 23dcc527a7 Merges PR 5707 that resolves #5611. 
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
 2021-11-18 23:33:42 -05: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
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
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
pereslav 62971fa7bd PR feedback, removed unnecessary code 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-19 13:52:32 +01: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
Gene Walters 7e6d35b046 small fix to include using <> 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 20:11:29 -07: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 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 50fe8bc04d pass in AZ::Utils::GetProjectPath().c_str() directly since converting projectpath is not needed 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-06 16:35:21 -07: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
AMZN-Olex 0a11e8ffc5 Optimization for looking up components. 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-05 11:26:31 -04: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
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