merge Develop into master #2

Merged
SemvdH merged 81 commits from develop into master 2020-09-18 14:44:28 +00:00
2 changed files with 19 additions and 5 deletions
Showing only changes of commit b2163b0459 - Show all commits

View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using LibNoise.Primitive;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.IO;
@@ -114,10 +115,23 @@ namespace RH_Engine
return;
}
WriteTextMessage(stream, createGraphics.RoadCommand(routeID));
Console.WriteLine("tunnelID is: " + tunnelID);
//string groundId = GetId("GroundPlane", stream, createGraphics);
//Console.WriteLine("ground id: " + groundId);
WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 256, 256 }, null));
Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.AddBikeModel();
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.AddModel("car", "data\\customModels\\TeslaRoadster.fbx");
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));

View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>