Commit Graph

409 Commits

Author SHA1 Message Date
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
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
kberg-amzn 95d7cc7212 Adding the NetworkConnectionComponent to hold user nonce and migration values for a backup host in case the current host crashes or abnormally disconnects
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 12:14:41 -07:00
kberg-amzn 2c19abf7ee Merge pull request #4287 from aws-lumberyard-dev/LYN6657_MultiplayerScriptImprovementsForDemo
LYN6657 Misc Improvements for Multiplayer Scripting
2021-09-24 14:11:14 -07:00
SergeyAMZN 66a875bf79 Merge pull request #4261 from aws-lumberyard-dev/MPSpawnableHolderUpdate
Updated NetworkSpawnableHolderComponent to use TransformBus instead o…
2021-09-24 19:06:21 +01:00
pereslav bf1ebea202 Moved local variable to a smaller scope
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 17:12:58 +01:00
pereslav 44c8ae2872 Changed NetworkSpawnableHolderComponent to use Entity::GetTransform instead of an ebus call
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 13:03:02 +01: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 a44af20f9a Adding parameter names to NetworkCharacterComponent script events so people know what the parameters are used for in scriptcanvas
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 13:01:34 -07:00
puvvadar f142e30da6 Fix AutoGen of RPCs with no params
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-23 12:56:46 -07:00
Gene Walters cd85df35b6 Make sure Multiplayer AutoComponents dont generate property OnChange script events if GenerateEventBindings is disabled
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 12:45:44 -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
pereslav 1087498d00 Merge branch 'development' of https://github.com/o3de/o3de into MPSpawnableHolderUpdate 2021-09-23 12:41:41 +01:00
pereslav ae2525564d Updated NetworkSpawnableHolderComponent to use TransformBus instead of FindComponent. Added dependency on TransformService
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-22 13:29:55 +01: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 aacb6a18db Hook up the last client inputId to the migrate notification
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-21 19:41:23 -07:00
kberg-amzn e8aeb9b101 Format fixing
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-21 19:37:54 -07: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 dc0bb00c10 Added an error check in case of a requested spawnable is not networked
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-21 14:58:33 +01: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
puvvadar f2841f2eba Fix interpolation logic errors in NetworkTransform
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-17 14:11:29 -07:00
pereslav 454ae90afb Added a few whitespaces
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-17 17:15:21 +01:00
kberg-amzn f1f35a0ba8 Merge pull request #4003 from aws-lumberyard-dev/MultiplayerRewindClear
Multiplayer rewind clear
2021-09-16 10:18:46 -07:00
pereslav a3dfb88696 Added support for instantiating network spawnables for any spawnables, not just root spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-16 17:48:53 +01:00
AMZN-Olex 2be5854beb Cleanup
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-15 18:49:24 -04:00
AMZN-Olex 2637fa45b8 Minor refactor to address CR
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-15 18:43:56 -04:00
AMZN-Olex 9e31c3ebf5 Refactoring m_isDeactivating into m_isHierarchyEnabled
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-15 18:41:08 -04:00
Gene Walters 0cda54c84d Fixing copyright headers. Also removing some #includes that HitVolumes didn't need
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-15 09:08:06 -07:00
AMZN-Olex 714dc0a0e8 Refactoring away the use of AZ::TransformNotificationBus. Added unittests for deactivating parents of inner roots.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-15 11:29:10 -04:00
Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
2021-09-14 15:32:35 -07:00
Gene Walters 73b04d7e34 Network Input Exposed to Script (#3990)
* NetworkInput now has new attribute called ExposeToScript. NetworkInput with this attribute set to True will be exposed to behavior context. Also added a CreateFromValues for the NetworkInput where scripters can create an instance of the MyComponentNetworkInput class which will eventually be passed around CreateInput and ProcessInput events.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Adding Create Input event handler. SC can now receive the event to create input, and send it over the network

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Auto-component controller will now generate CreateInput/ProcessInput methods if they have input exposed to script, not ready for use yet, just stubbed in

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Reducing code replication by putting common network input variables into AutoComponent_Common.jinja

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Fix minor comment typo in the CreateInput method

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Small fix. Changing ebus call from MyComponentNameCreateInput to just CreateInput. It's part of the MyComponentRequestBus so adding the component name before CreateInput is noisy

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Cleaning with jinja a bit using macro calls to iterate over scriptable netinputs

Signed-off-by: Gene Walters <genewalt@amazon.com>

* ProcessInput will now be triggered in script

Signed-off-by: Gene Walters <genewalt@amazon.com>

* ProcessInput event is sent to script. Script can now create and process input. Tested locally with a simple script.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Created a seperate CreateInputFromScript and ProcessInputFromScript. Developers no longer need to remember to call the BaseClass::CreateInput and ProcessInput since CreateInputFromScript will automatically be called beforehand.

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-14 12:01:32 -07:00
Gene Walters 3973e1d3e5 Moved NetworkCharacterComponent out of MPSample and into MP gem
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-14 09:14:55 -07:00