Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict ...

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

2021-10-06 16:55:58 -07:00

..

AutoGen

merging latest dev

2021-10-01 09:53:16 -07:00

Components

Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup

2021-10-04 13:50:28 -07:00

ConnectionData

Merge latest to mp_handshake_conndata

2021-10-04 13:58:09 -07:00

Debug

Fix unused warnings release (#3677)

2021-08-30 13:10:41 -07:00

Editor

merging latest dev + resolving 1 conflict

2021-10-06 16:55:58 -07:00

EntityDomains

Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around

2021-09-30 22:53:51 -07:00

NetworkEntity

Removing old EntityReplicationManager.h that got re-added, this has been moved to public includes

2021-10-04 09:39:35 -07:00

NetworkInput

Merging development to mp_lerp_jitter

2021-07-22 14:12:14 -07:00

NetworkTime

Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around

2021-09-30 22:53:51 -07:00

Physics

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Pipeline

merging latest dev

2021-10-01 09:53:16 -07:00

ReplicationWindows

Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around

2021-09-30 22:53:51 -07:00

MultiplayerGem.cpp

Merged dev

2021-09-22 08:09:53 -04:00

MultiplayerGem.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MultiplayerStats.cpp

Refactoring to use AZ::Events

2021-07-28 09:53:44 -04:00

MultiplayerSystemComponent.cpp

merging latest dev + resolving 1 conflict

2021-10-06 16:55:58 -07:00

MultiplayerSystemComponent.h

merging latest dev + resolving 1 conflict

2021-10-06 16:55:58 -07:00

MultiplayerToolsModule.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

MultiplayerToolsModule.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MultiplayerTypes.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00