Commit Graph

354 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
kberg-amzn f1f35a0ba8 Merge pull request #4003 from aws-lumberyard-dev/MultiplayerRewindClear
Multiplayer rewind clear
2021-09-16 10:18:46 -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
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
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
kberg-amzn 0b7c4fff85 Clear rewound entities if we attempt to sync rewind state outside of a scoped rewind
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-07 21:08:51 -07:00
Esteban Papp 4a972d96f9 Gems others
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 20:37:33 -07:00
Gene Walters ffd0bbc165 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 2021-08-31 19:52:58 -07:00
kberg-amzn e7f0853b0e Merge pull request #3689 from aws-lumberyard-dev/ContainerReplicationAndStats
Container replication and stats
2021-08-30 15:55:38 -07:00
Steve Pham fa0f2a1007 Fix unused warnings release (#3677)
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.com>
2021-08-30 13:10:41 -07:00
kberg-amzn b1faad8406 Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats 2021-08-30 12:06:45 -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
puvvadar a5d9e2e22d Merge pull request #3434 from aws-lumberyard-dev/mp_custom_handshake
Move packet dispatch to return an enum that includes a pending option
2021-08-30 10:18:35 -07:00
puvvadar ebbe4b99a4 Add const to some funcs and fix a comment
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-25 10:21:29 -07:00
puvvadar decf15df21 Move packet dispatch to return an enum that includes a pending option
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-24 16:19:38 -07:00
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 14:51:35 -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
Esteban Papp b406129fd2 Another warning fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 11:41:46 -07:00
puvvadar 80584a7130 Merge pull request #3310 from aws-lumberyard-dev/mp_serverrpc_bugfix
Fix type error with Server to Authority RPC generation
2021-08-20 09:52:51 -07:00
puvvadar 4e618db62d Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
2021-08-20 09:52:11 -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
SergeyAMZN 2f48973921 Merge pull request #3327 from aws-lumberyard-dev/MPWeaponsSQ
Added the ability to look up a Net Entity ID for a given AZ Entity ID
2021-08-20 13:24:08 +01:00
puvvadar 41ec5c6ddd Fix one more jinja issue with IsProtected in RPCs
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-19 17:08:01 -07:00
puvvadar 99317a4ad1 Update naming to match other functions in jinja header
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-19 16:39:11 -07:00
puvvadar cbf612d4e7 Update naming to match other functions in jinja
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-19 16:36:41 -07:00
puvvadar ec351c9fce Correct jinja logic slightly
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-19 16:27:04 -07:00
puvvadar bef2e1400c Add check for Client invocation in jinja
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-19 13:39:08 -07:00
Esteban Papp 61f7fe5dc5 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-19 12:25:41 -07: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
puvvadar 32d01f6abd Further fixes to Server to Authority RPC generation
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-18 14:31:05 -07:00
puvvadar 716275b8da Fix type error with Server to Authority RPC generation
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-18 11:41:09 -07:00
Esteban Papp 1d7f690e06 missing header includes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 18:02:49 -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 9e4c434095 unreachable code in jinja
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:41:23 -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
Esteban Papp 2d09e9c60e Gems/Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:40 -07:00
pappeste 9052764980 Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:14 -07:00
Gene Walters e475405850 Updating multiplayer auto-components to require the LocalPredictionPlayerInputComponent service if they use NetworkInputs. Without LocalPredictionPlayerInputComponent CreateInput and ProcessInput will never be called
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-08-16 15:53:55 -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
Vincent Liu 9579826b5c [SPEC-7971] Update gem module name to match cmake target name (#3055)
Fixes for module names so they match cmake target name
2021-08-12 10:56:51 -07:00
Gene Walters 85d4abae83 Move MultiplayerComponent destructor to cpp (which #includes the controller) so that when it comes time to destroy the unique_ptr<Controller> it can do so on a complete type. Also, minor spelling error fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-08-12 09:22:56 -07:00
sconel fbcb6510e6 Update storage of Prefab Dom info to be best effort (#2862)
* Update storage of Prefab Dom info to be best effort

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

* Update IssueReporter to Skipped instead of PartialSkip

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

* Address PR feedback

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

* Fix failing Prefab Unit Test that expected default values to be stripped

Signed-off-by: sconel <sconel@amazon.com>
2021-08-11 10:45:31 -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
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00