birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,800 Commits 3 Branches 3 Tags
3040f74c4135ff438ee657cfa2a44a0ac89a74e3
Commit Graph

161 Commits

Author SHA1 Message Date
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
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
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
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
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
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
AMZN-Olex cb75607106 Merged dev 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-22 08:09:53 -04:00
SergeyAMZN 35517c4e6a Merge pull request #4023 from aws-lumberyard-dev/MPSpawnableRework 
Reworked net entities instantiation in order to fix entity references…
 2021-09-22 10:50:35 +01:00
kberg-amzn d28bcbe027 Reverts changes to component application and adds further client migration handling hookup 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 19:33:59 -07:00
AMZN-Olex 5f73061227 Adding client side on-parent-changed logic for Network Transform Component 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-21 22:19:21 -04:00
kberg-amzn ca7de715fd minor code cleanup 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 11:56:19 -07:00
AMZN-Olex f85a7dfeeb Merged dev 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-21 12:57:57 -04:00
pereslav 895974db57 Removed spawn/despawn events from the spawnable system. Used NetworkSpawnableHolderComponent instead 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-09-21 14:50:06 +01:00
kberg-amzn 1000a07b3f merging latest main 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 17:26:11 -07:00
Gene Walters 465f91c7f5 Fix compiler error because EntityPreRenderEvent only takes one float for deltaTime now 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-20 14:59:28 -07:00
kberg-amzn 22ab484986 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 14:07:49 -07:00
kberg-amzn 52004f6cb5 Merge pull request #4120 from aws-lumberyard-dev/LYN6527_MoveMPSampleComponents_into_MultiplayerGem 
Move Multiplayer Sample Components into Multiplayer Gem
 2021-09-20 13:50:00 -07:00
kberg-amzn 011bd5d10e merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:28:57 -07:00
kberg-amzn 8401ee409b merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:27:45 -07:00
AMZN-Olex bcc77d75db Merge branch 'development' of https://github.com/o3de/o3de into Network/olex/hierarchy_component_phase1_pr 2021-09-20 09:58:43 -04:00
kberg-amzn 6e84495975 Changes to make client and entity migration functional, needed in the event of a host quitting necessitating a host migration 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-17 16:48:16 -07:00
Gene Walters 95a1b9c1a3 Minor commenting improvements based on PR feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-17 15:37:18 -07:00
puvvadar bc8ccde318 Merge branch 'development' of https://github.com/o3de/o3de into mp_blending_cleanup 2021-09-17 15:03:43 -07:00
puvvadar 67e2498a12 Update GetPrevious to behave similarly to Get when rewound on owning connection 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-17 14:43:14 -07:00
Gene Walters ca5e26e2f9 Merge branch 'upstream/development' into LYN6527_MoveMPSampleComponents_into_MultiplayerGem 2021-09-17 14:30:57 -07:00
Gene Walters ae8ed4462f Small fix for Linux compiler 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-15 18:31:35 -07:00