merge Develop into master #2

Merged
SemvdH merged 81 commits from develop into master 2020-09-18 14:44:28 +00:00
Showing only changes of commit 2adfce27b0 - Show all commits

View File

@@ -1,7 +1,9 @@
using System; using Newtonsoft.Json.Linq;
using System;
using System.IO; using System.IO;
using System.Net.Sockets; using System.Net.Sockets;
using System.Runtime.Intrinsics.X86; using System.Runtime.Intrinsics.X86;
using System.Security.Cryptography.X509Certificates;
using System.Text; using System.Text;
namespace RH_Engine namespace RH_Engine
@@ -95,4 +97,12 @@ namespace RH_Engine
return "PC - host:" + host + " - user:" + user; return "PC - host:" + host + " - user:" + user;
} }
} }
public readonly struct VRMessage
{
public VRMessage(string id,params JObject[] data)
{
}
}
} }