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 2e19b4af92 - Show all commits

View File

@@ -68,19 +68,22 @@ namespace RH_Engine
} }
object payload = new dynamic payload = new
{ {
id = "scene/skybox/settime", id = "scene/skybox/settime",
data = new {
time = timeToSet time = timeToSet
}
}; };
object packet = Payload(payload); dynamic packet = Payload(payload);
Console.WriteLine(JsonConvert.SerializeObject(packet)); Console.WriteLine(JsonConvert.SerializeObject(packet));
return JsonConvert.SerializeObject(packet); return JsonConvert.SerializeObject(packet);
} }
private object Payload(object message) private object Payload(dynamic message)
{ {
return new return new
{ {