merge conflicts
This commit is contained in:
@@ -15,14 +15,14 @@ namespace RH_Engine
|
|||||||
this.tunnelID = tunnelID;
|
this.tunnelID = tunnelID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string TerrainCommand(int[] sizeAray, int[] heightsArray)
|
public string TerrainCommand(int[] sizeArray, int[] heightsArray)
|
||||||
{
|
{
|
||||||
dynamic payload = new
|
dynamic payload = new
|
||||||
{
|
{
|
||||||
id = "scene/terrain/add",
|
id = "scene/terrain/add",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
size = sizeAray,
|
size = sizeArray,
|
||||||
heights = heightsArray
|
heights = heightsArray
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,6 +30,12 @@ namespace RH_Engine
|
|||||||
return JsonConvert.SerializeObject(Payload(payload));
|
return JsonConvert.SerializeObject(Payload(payload));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string AddNodeCommand()
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
public string DeleteGroundPaneCommand(string uuid)
|
public string DeleteGroundPaneCommand(string uuid)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user