08b1529da8
Merge from development
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-10-08 21:27:55 +01:00
b464ff966c
merging latest dev + resolving 1 merge conflict
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-06 16:53:25 -07:00
a58325e691
Enabled multi-entities player prefabs. Added updating replication set for hierarchy children. PR feedback addressing
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-10-07 00:38:07 +01:00
d36041d1b7
Update based on feedback. Adding event to MPSystemComponent for receiving a server acceptance packet. The editor system component subscribes to this event and tells the server we're ready for entity updates
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-06 15:48:54 -07:00
170a32d667
Merge latest to mp_handshake_conndata
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-10-04 13:58:09 -07:00
73891c71b7
Fix EditorServer connection by ensuring that SendReadyForEntityUpdates is only called after a handshake is finished and the editor has accepted the editorserver's connection. Also allow engine-centric projects to use editor-server by passing in the project-path when launching the editor-server. Also allow devs to set sv_defaultPlayerSpawnAsset from inside the editor and it'll be used by the editor-server
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-03 22:49:13 -07:00
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
0a6ddfab5e
Revert optimization change in favor of another PR
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-10-01 11:02:12 -07:00
865ed60007
merging latest dev
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-10-01 09:53:16 -07:00
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
2811a84187
Move did handshake logic to connection data plus an optimization
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-09-30 19:59:34 -07:00
f44169f7fa
Cleanup SerializeContext.h pt.1 ( #4264 )
...
* Remove AssetSerializer inclusion from SerializeContext header
Moved a few Reflect methods to new cpp files.
In addition, some preparations for further header dependency reductions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix smoke test lua failures.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Windows build fixes.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Missing license headers
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix white-space issues.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix inheritance list wrapping broken by older clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-09-29 11:31:01 -05:00
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
0a829f9661
Merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-27 15:50:22 -07:00
f837f0494b
many bug fixes
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-23 18:25:46 -07:00
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
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
011bd5d10e
merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-20 13:28:57 -07:00
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
bc8ccde318
Merge branch 'development' of https://github.com/o3de/o3de into mp_blending_cleanup
2021-09-17 15:03:43 -07:00
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
b1faad8406
Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats
2021-08-30 12:06:45 -07:00
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
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
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
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
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
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:12 -07:00
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
9052764980
Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:14 -07:00
976654e809
Merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-08-03 13:15:59 -07:00
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
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
8612d7bce2
Fix incorrect blending math
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-07-29 13:35:32 -07:00
496a0f686f
Merge branch 'development' of https://github.com/o3de/o3de into mp_lerp_jitter
2021-07-29 09:58:07 -07:00
6839497d99
Corrects math computing blend factors to interpolate state between received network updates
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-07-28 12:31:19 -07:00
08a53a3a6f
Merging development to mp_lerp_jitter
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-07-22 14:12:14 -07:00
52780f2130
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
2021-07-20 14:13:24 -07:00
ebe326f6e9
Add server side accounting for blend factor
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-07-20 14:12:06 -07:00
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
07a1af99ba
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
2021-07-19 12:04:46 -07:00
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
68d2536b3b
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
2021-07-07 13:11:17 -07:00
bd5226aac5
Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-07-07 10:41:44 -07:00
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 16:25:06 +01:00
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-07 00:12:30 +01:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
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
d7bfd34a67
IFilterEntityManager work
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-06-30 19:18:06 -04:00
pereslav
Gene Walters
puvvadar
kberg-amzn
Artur K
Esteban Papp
SergeyAMZN
pappeste
nvsickle
Gene Walters
Steve Pham
hultonha
Chris Galvan
AMZN-Olex