Commit Graph

104 Commits

Author SHA1 Message Date
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
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
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
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
Gene Walters ffd0bbc165 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 2021-08-31 19:52:58 -07:00
kberg-amzn 99d71cfbc5 Added delta replication and stat tracking to vector and array network property container types, + some minor cleanup I ran into when looking for the best hook points for this functionality
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-30 12:05:53 -07:00
SergeyAMZN 5bc46fc676 Merge pull request #2639 from aws-lumberyard-dev/nvsickle/NetworkingActivationOrder
Ensure network autonomy gets set before entity activation
2021-08-20 14:09:30 +01:00
pereslav 92a46c705e Added the ability to look up a Net Entity ID for a given AZ Entity ID
Signed-off-by: pereslav <pereslav@amazon.com>
2021-08-19 16:57:32 +01:00
Gene Walters 4374e6177e Updating service requirement to use a generic 'MultiplayerInputDrive', that way if other developers want to make a non-local predictition player controller that calls create/process on the server they can do so as long as there custom component provides this 'MultiplayerInputDriver' service
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-08-16 20:46:34 -07:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
kberg-amzn f85e8124a9 Fixes and cleanup for recent correction changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-09 16:17:23 -07:00
kberg-amzn 976654e809 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-03 13:15:59 -07:00
kberg-amzn e0d0bbfdae Changes to desync debug output to make it less stressful on bandwidth and the server, as well as some fixes to corrections on the local client
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-03 13:12:37 -07:00
AMZN-Olex 2118ef7a21 Preparing for PR
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-08-03 12:48:36 -04:00
AMZN-Olex 73b9daad25 Merged development
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-08-02 20:54:46 -04:00
AMZN-Olex 93a3d3efa0 Bandwith overlay works without imgui
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-08-02 15:57:29 -04:00
puvvadar 02486a6fbe Add usage intention to GetPrevious descriptor
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-30 11:38:53 -07:00
nvsickle 9041c8c917 Ensure network autonomy gets set before entity activation on non-dedicated servers
-Exposes an AutoActivate flag to INetworkEntityManager and ensured it got respected for all paths
-Tweak SpawnDefaultPlayerPrefab to not immediately activate its spawned entity to allow SetAllowAutonomy to be picked up from the net bind component during component activation

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-29 16:59:13 -07:00
AMZN-Olex 462c31b5de Refactoring to use AZ::Events
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-07-28 09:53:44 -04:00
AMZN-Olex a2f3066fa3 Imgui per entity works
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-07-26 21:59:19 -04:00
AMZN-Olex f29fd86a39 More converstion in progress
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-07-26 19:11:28 -04:00
puvvadar b4e8801095 Account for new blend factor calc and updated ScopedAlterTime usages
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-23 14:51:53 -07:00
puvvadar 08a53a3a6f Merging development to mp_lerp_jitter
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-22 14:12:14 -07:00
puvvadar b55bad496d Adding rewindable mechanisms to support interpolation
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-22 13:49:05 -07:00
puvvadar 69d5f64bb7 Add function documentation for GetCurrentBlendFactor
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-20 14:21:00 -07:00
puvvadar ebe326f6e9 Add server side accounting for blend factor
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-20 14:12:06 -07:00
Gene Walters d411c1d1d9 Autonomous to Authority Net Properties (#2153)
* WIP. Autonomous->Authority network properties now functional. Still need some research in regards to entity ownership when it comes to the PropertyPublisher.

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

* WIP. Exposing Auton->Auth Properties accessors and onchange events

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

* Fix propertypublisher constructor to skip the creation state if we arent the owner. Removing ClientToServerReplicationWindow, return to just using NullReplicationWindow.

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

* Reverting some wip debug prints

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

* Minor whitespacing fix

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

* minor undoing of whitespacing

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

* NullReplicationWindow MaxReplication is 0, but now Autonomous entity updates will always be added to the send list (ignoring the max replication limit)

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

* Updating PropertyPublisher comment to explicitly call out if we dont own the entity locally, the remote replicator must exist

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

* Renaming RepiclationWindow GetMaxEntityReplicatorSendCount to GetMaxProxyEntityReplicatorSendCount; this number only affects the number of proxy sends and allows autonomous properties to always send

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-07-20 10:29:41 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
puvvadar 7950c2b549 Add target host frame ID tracking to network transform
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-15 13:45:49 -07:00
Chris Galvan 7677f2b49d Fixed additional copyright header issue from latest development pull
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 17:36:22 -05:00
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
AMZN-Olex d7bfd34a67 IFilterEntityManager work
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-06-30 19:18:06 -04:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
puvvadar 632d774d4c Add disconnect type param to Terminate 2021-06-23 11:44:21 -07:00
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 2021-06-23 10:56:22 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
AMZN-Olex f79cca6f9d Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-22 16:43:21 -04:00
Mike Balfour 9aa44a56e7 Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
2021-06-22 15:14:22 -05:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
AMZN-puvvadar 0186911a3a Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
AMZN-Olex ece1187683 Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-21 20:28:43 -04:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
stramer 673495c49d Address additional review comments.
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
2021-06-17 18:01:44 -07:00
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 2021-06-17 16:25:44 -07:00
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 2021-06-17 16:17:36 -07:00