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

149 Commits

Author SHA1 Message Date
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
kberg-amzn 5acb360fbb Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup 
Migration fixup
 2021-10-04 13:50:28 -07: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
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
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
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
AMZN-Olex fcd5b3f184 Converted to use AZ::Events for hiearchy notifications. Added unittests. 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-14 11:50:51 -04:00
AMZN-Olex 05e464b31b Improving comments 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-13 18:45:22 -04:00
AMZN-Olex 853cffbf7b Comment cleanup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-13 18:37:05 -04:00
AMZN-Olex 2a10c400a7 Comments cleanup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-13 18:28:52 -04:00
Gene Walters 28ca59ae61 Moving NetworkHitVolumesComponent and NetworkRigidBodyComponent to the MultiplayerGem 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-09-13 15:00:42 -07:00
AMZN-Olex aa6c038880 Hierarchical components, phase 1, unittests 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-09-13 16:51:50 -04:00
puvvadar c5d8c194df Cleaning up NetworkTime and reworking how we approach network interpolation 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-09-02 14:24:46 -07:00