Skip to content
This repository was archived by the owner on Dec 5, 2018. It is now read-only.

13.1.0 #10

Merged
merged 2 commits into from
Jul 6, 2018
Merged

13.1.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b1dd9
Upgrade to SpatialOS 13.1.0
oblm Jul 6, 2018
036422c
Upgrade to Unity SDK 2.0.1
oblm Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spatialos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "your_project_name_here",
"project_version": "1.0.0",
"sdk_version": "13.0.0",
"sdk_version": "13.1.0",
"dependencies": [
{"name": "standard_library", "version": "13.0.0"}
{"name": "standard_library", "version": "13.1.0"}
]
}
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/Linux/Plugins/x86_64/libCoreSdkDll.so
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/Windows/Plugins/x86/CoreSdkDll.dll
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/Windows/Plugins/x86/CoreSdkDll.lib
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/Windows/Plugins/x86_64/CoreSdkDll.dll
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Core/Windows/Plugins/x86_64/CoreSdkDll.lib
View file
Open in desktop
Binary file not shown.
Binary file modified workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...ers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

700 changes: 350 additions & 350 deletions workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 36 additions & 11 deletions workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions workers/unity/Assets/Plugins/Improbable/Sdk/Src/Unity/Commands/ComponentCommander.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Improbable.Unity.Core
{
class ComponentCommander : IComponentCommander
{
private const uint DefaultCommandTimeoutMs = 1000;
public const uint DefaultCommandTimeoutMs = 1000;

private readonly HashSet<Type> commandResponseThunksRegistered;
private readonly Dictionary<uint, ICommandCallbackWrapper> requestIdToCallback;
Expand Down Expand Up @@ -94,7 +94,7 @@ private Option<uint> SendGenericCommand<TResponse>(CommandCallback<TResponse> ca
return new Option<uint>();
}

var timeoutMs = timeout.HasValue ? (uint) timeout.Value.Milliseconds : DefaultCommandTimeoutMs;
var timeoutMs = timeout.HasValue ? (uint) timeout.Value.TotalMilliseconds : DefaultCommandTimeoutMs;
var requestId = sendRequestWithTimeoutMs(timeoutMs);
requestIdToCallback.Add(requestId, callbackWrapper);
return requestId;
Expand Down
Binary file modified workers/unity/Improbable/bin/UnityCodeGenerator.exe
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions workers/unity/Improbable/build_script/spatialos.unity.client.build.experimental.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"--output=.spatialos/generated/std",
"--language=csharp",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -25,7 +25,7 @@
"--language=csharp",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -37,7 +37,7 @@
"--output=.spatialos/json/std",
"--language=ast_json",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -50,7 +50,7 @@
"--language=ast_json",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions workers/unity/Improbable/build_script/spatialos.unity.client.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"--output=.spatialos/generated/std",
"--language=csharp",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -25,7 +25,7 @@
"--language=csharp",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -37,7 +37,7 @@
"--output=.spatialos/json/std",
"--language=ast_json",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -50,7 +50,7 @@
"--language=ast_json",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions workers/unity/Improbable/build_script/spatialos.unity.worker.build.experimental.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"--output=.spatialos/generated/std",
"--language=csharp",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -25,7 +25,7 @@
"--language=csharp",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -37,7 +37,7 @@
"--output=.spatialos/json/std",
"--language=ast_json",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -50,7 +50,7 @@
"--language=ast_json",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions workers/unity/Improbable/build_script/spatialos.unity.worker.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"--output=.spatialos/generated/std",
"--language=csharp",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -25,7 +25,7 @@
"--language=csharp",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -37,7 +37,7 @@
"--output=.spatialos/json/std",
"--language=ast_json",
"--input=../../build/dependencies/schema/standard_library",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand All @@ -50,7 +50,7 @@
"--language=ast_json",
"--input=../../schema",
"--repository=../../build/dependencies/schema",
"--version=13.0.0"
"--version=13.1.0"
]
},
{
Expand Down