Skip to content
This repository has been archived by the owner on Oct 20, 2021. It is now read-only.

14.0.1 upgrade #69

Merged
merged 5 commits into from
Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

- The **SpatialOS** > **Generate snapshot** button now generates a snapshot directly without displaying a pop-up window. [#68](https://github.com/spatialos/gdk-for-unity-blank-project/pull/68)

### Internal

- Removed old arguments from the worker JSON files. [#69](https://github.com/spatialos/gdk-for-unity-blank-project/pull/69)

## `0.2.6` - 2019-08-05

### Changed
Expand Down
2 changes: 1 addition & 1 deletion gdk.pinned
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e31c47b5050ee67cafe8962204aa86a259095db0
618c28ce0a3d13d17859aab25d8818ca159f4c6c
4 changes: 2 additions & 2 deletions spatialos.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "unity_gdk",
"project_version": "0.0.1",
"sdk_version": "13.8.2",
"sdk_version": "14.0.1",
"dependencies": [
{"name": "standard_library", "version": "13.8.2"}
{"name": "standard_library", "version": "14.0.1"}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public async void Start()
builder.SetConnectionFlow(new ReceptionistFlow(CreateNewWorkerId(WorkerType),
flowInitializer));
break;
case ConnectionService.AlphaLocator:
builder.SetConnectionFlow(new AlphaLocatorFlow(flowInitializer));
case ConnectionService.Locator:
builder.SetConnectionFlow(new LocatorFlow(flowInitializer));
break;
default:
throw new ArgumentException("Received unsupported connection service.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ private async void Start()
case ConnectionService.Locator:
builder.SetConnectionFlow(new LocatorFlow(initializer));
break;
case ConnectionService.AlphaLocator:
builder.SetConnectionFlow(new AlphaLocatorFlow(initializer));
break;
default:
throw new ArgumentOutOfRangeException();
}
Expand Down
10 changes: 0 additions & 10 deletions workers/unity/spatialos.UnityClient.worker.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
"arguments": [
"+workerType",
"UnityClient",
"+infraServicesUrl",
"http://127.0.0.1:21000",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"-logfile",
"../../logs/external-default-unityclient.log"
]
Expand All @@ -53,14 +49,8 @@
"-n",
"./build/worker/UnityClient@Mac/UnityClient@Mac.app",
"--args",
"+assemblyName",
"local_assembly",
"+workerType",
"UnityClient",
"+infraServicesUrl",
"http://127.0.0.1:21000",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"-logfile",
"../../logs/external-default-unityclient.log"
]
Expand Down
22 changes: 3 additions & 19 deletions workers/unity/spatialos.UnityGameLogic.worker.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
"arguments": [
"+workerType",
"UnityGameLogic",
"+infraServicesUrl",
"http://127.0.0.1:21000",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"-batchmode",
"-nographics",
"-logfile",
Expand All @@ -55,14 +51,8 @@
"-n",
"./build/worker/UnityGameLogic@Mac/UnityGameLogic@Mac.app",
"--args",
"+assemblyName",
"local_assembly",
"+workerType",
"UnityGameLogic",
"+infraServicesUrl",
"http://127.0.0.1:21000",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"-batchmode",
"-nographics",
"-logfile",
Expand All @@ -80,14 +70,12 @@
"UnityGameLogic",
"+workerId",
"${IMPROBABLE_WORKER_ID}",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"+receptionistHost",
"${IMPROBABLE_RECEPTIONIST_HOST}",
"+receptionistPort",
"${IMPROBABLE_RECEPTIONIST_PORT}",
"+linkProtocol",
"RakNet",
"Tcp",
"-batchmode",
"-nographics",
"-logfile",
Expand All @@ -102,14 +90,12 @@
"UnityGameLogic",
"+workerId",
"${IMPROBABLE_WORKER_ID}",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"+receptionistHost",
"${IMPROBABLE_RECEPTIONIST_HOST}",
"+receptionistPort",
"${IMPROBABLE_RECEPTIONIST_PORT}",
"+linkProtocol",
"RakNet",
"Tcp",
"-batchmode",
"-nographics",
"-logfile",
Expand All @@ -124,14 +110,12 @@
"UnityGameLogic",
"+workerId",
"${IMPROBABLE_WORKER_ID}",
"+projectName",
"${IMPROBABLE_PROJECT_NAME}",
"+receptionistHost",
"${IMPROBABLE_RECEPTIONIST_HOST}",
"+receptionistPort",
"${IMPROBABLE_RECEPTIONIST_PORT}",
"+linkProtocol",
"RakNet",
"Tcp",
"-batchmode",
"-nographics",
"-logfile",
Expand Down