Commit Graph

84 Commits

Author SHA1 Message Date
kberg-amzn ca7de715fd minor code cleanup
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-21 11:56:19 -07: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
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
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
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
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
puvvadar de512db010 Determine blended timestamp on client plus minor API cleanup
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-01 16:26:56 -07:00
Gene Walters ffd0bbc165 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 2021-08-31 19:52:58 -07:00
Esteban Papp ea2f74dc0f more fixes for Gems
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 14:51:12 -07: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
Esteban Papp b8787739e1 more fixes after rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:05:50 -07:00
pappeste 9052764980 Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:14 -07:00
kberg-amzn 693b205747 Removing debug code, and fixing vector/array not respecting replication record dirty bits
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-13 16:56:27 -07:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
kberg-amzn 716089e803 More fixes and some temp debugging logs
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-13 09:57:40 -07:00
Olex Lozitskiy 5363105c6d SIG/Network - Migrated legacy multiplayer per entity analytics over to O3DE Multiplayer Gem
Added a new ImGui menu under Multiplayer: "Multiplayer Entity Stats"
2021-08-10 15:55:10 -04:00
kberg-amzn b957b26b54 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-09 16:27:29 -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
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07: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
puvvadar 8612d7bce2 Fix incorrect blending math
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-29 13:35:32 -07:00
pappeste 0f0a6c5cd3 Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 19:30:49 -07: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 ebe326f6e9 Add server side accounting for blend factor
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-20 14:12:06 -07:00
kberg-amzn 07a1af99ba Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons 2021-07-19 12:04:46 -07:00
kberg-amzn 23a4835e48 Desync debug work
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-07-19 12:03:57 -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
puvvadar 63cbb69797 Update previous transform to prevent jitter from lerping
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-13 15:05:27 -07: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
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 2021-06-20 20:51:59 -07:00
Gene Walters b9dd7a1ecd Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code 2021-06-17 16:16:38 -07:00