birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr

Browse Source
This commit is contained in:
AMZN-Olex
2021-09-23 16:29:40 -04:00
parent 3c46336ab0 05b75ea33c
commit 6d005c62f4
63 changed files with 48 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
+1 -1
View File
@@ -307,7 +307,7 @@ namespace Multiplayer
class ClientDeepHierarchyTests : public ClientSimpleHierarchyTests
{
public:
static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
void SetUp() override
{
Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
+12 -12
View File
@@ -414,12 +414,12 @@ namespace Multiplayer
class ServerBranchedHierarchyTests : public HierarchyTests
{
public:
static const NetEntityId RootNetEntityId = NetEntityId{ 1 };
static const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
static const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
static const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
const NetEntityId RootNetEntityId = NetEntityId{ 1 };
const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
void SetUp() override
{
@@ -610,9 +610,9 @@ namespace Multiplayer
class ServerHierarchyOfHierarchyTests : public ServerDeepHierarchyTests
{
public:
static const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
static const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
void SetUp() override
{
@@ -1132,9 +1132,9 @@ namespace Multiplayer
class ServerHierarchyWithThreeRoots : public ServerHierarchyOfHierarchyTests
{
public:
static const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
static const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
static const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
void SetUp() override
{