merge conflicts

This commit is contained in:
Sem van der Hoeven
2020-09-18 11:51:56 +02:00

View File

@@ -15,14 +15,14 @@ namespace RH_Engine
this.tunnelID = tunnelID;
}
public string TerrainCommand(int[] sizeAray, int[] heightsArray)
public string TerrainCommand(int[] sizeArray, int[] heightsArray)
{
dynamic payload = new
{
id = "scene/terrain/add",
data = new
{
size = sizeAray,
size = sizeArray,
heights = heightsArray
}
@@ -30,6 +30,12 @@ namespace RH_Engine
return JsonConvert.SerializeObject(Payload(payload));
}
public string AddNodeCommand()
{
return "";
}
public string DeleteGroundPaneCommand(string uuid)
{