Upgrade to 0.1.2 and release prep (#60)

jamiebrynes7 · web-flow · commit f3f4756c032f · 2018-11-02T13:49:15.000Z
* Update signature of ClientWorkerConnector.HandleWorkerConnectionFailure

* upgrading Unity and fixing more worker stuff

* updating hash and disabling simulated player coordinator for development scene

* update spatialos.json

* 0.1.2 release

* update changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## `0.1.2` - 2018-11-02
+
+### Changed
+
+- Updated to GDK for Unity version `0.1.2`.
+
 ### Fixed
 
 - Fixed an issue where newer versions of Unity would fail to open the project with errors like: `ParticleSystem` not found.
diff --git a/ci/UnityEditorHash.txt b/ci/UnityEditorHash.txt
@@ -1 +1 @@
-ae1180820377
+3262fb3b0716
diff --git a/gdk.pinned b/gdk.pinned
@@ -1 +1 @@
-0.1.1
+0.1.2
diff --git a/spatialos.json b/spatialos.json
@@ -1,8 +1,8 @@
 {
     "name": "unity_gdk",
     "project_version": "0.0.1",
-    "sdk_version": "14.0-b6143-48ac8-WORKER-SNAPSHOT",
+    "sdk_version": "14.0-b6841-3d544-WORKER-SNAPSHOT",
     "dependencies": [
-        {"name": "standard_library", "version": "14.0-b6143-48ac8-WORKER-SNAPSHOT"}
+        {"name": "standard_library", "version": "14.0-b6841-3d544-WORKER-SNAPSHOT"}
     ]
 }
diff --git a/workers/unity/Assets/Fps/Scenes/FPS-Development.unity b/workers/unity/Assets/Fps/Scenes/FPS-Development.unity
@@ -1736,6 +1736,10 @@ Prefab:
       propertyPath: DefaultSimulatedPlayerCount
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 1971737696589158, guid: a18c738cbcda9914591d9af24a618907, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a18c738cbcda9914591d9af24a618907, type: 2}
   m_IsPrefabAsset: 0
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs
@@ -58,7 +58,7 @@ protected override void HandleWorkerConnectionEstablished()
             base.HandleWorkerConnectionEstablished();
         }
 
-        protected override void HandleWorkerConnectionFailure()
+        protected override void HandleWorkerConnectionFailure(string errorMessage)
         {
             connectionController.OnFailedToConnect();
         }
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/SimulatedPlayerWorkerConnector.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/SimulatedPlayerWorkerConnector.cs
@@ -1,12 +1,11 @@
-﻿using System;
+using System;
 using Fps;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.GameObjectCreation;
 using Improbable.Gdk.GameObjectRepresentation;
-using Improbable.Gdk.Health;
 using Improbable.Gdk.PlayerLifecycle;
 
-public class SimulatedPlayerWorkerConnector : WorkerConnector
+public class SimulatedPlayerWorkerConnector : DefaultWorkerConnector
 {
     private const string AuthPlayer = "Prefabs/SimulatedPlayer/SimulatedPlayer";
     private const string NonAuthPlayer = "Prefabs/SimulatedPlayer/SimulatedPlayerProxy";
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/WorkerConnectorBase.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/WorkerConnectorBase.cs
@@ -1,11 +1,11 @@
-﻿using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Improbable.Gdk.Core;
 using Improbable.Worker.Core;
 using UnityEngine;
 
 namespace Fps
 {
-    public abstract class WorkerConnectorBase : WorkerConnector
+    public abstract class WorkerConnectorBase : DefaultWorkerConnector
     {
         private const string Small = "small";
         private const string Large = "large";
diff --git a/workers/unity/Packages/com.improbable.gdk.guns/package.json b/workers/unity/Packages/com.improbable.gdk.guns/package.json
@@ -1,13 +1,13 @@
 {
     "name": "com.improbable.gdk.guns",
     "displayName": "SpatialOS GDK Guns",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Guns Module. Made by Improbable.",
     "dependencies": {
-        "com.improbable.gdk.core": "0.1.1",
-        "com.improbable.gdk.standardtypes": "0.1.1",
-        "com.improbable.gdk.objectpooling": "0.1.1"
+        "com.improbable.gdk.core": "0.1.2",
+        "com.improbable.gdk.standardtypes": "0.1.2",
+        "com.improbable.gdk.objectpooling": "0.1.2"
     }
 }
diff --git a/workers/unity/Packages/com.improbable.gdk.health/package.json b/workers/unity/Packages/com.improbable.gdk.health/package.json
@@ -1,11 +1,11 @@
 {
     "name": "com.improbable.gdk.health",
     "displayName": "SpatialOS GDK Health",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Health Module. Made by Improbable.",
     "dependencies": {
-        "com.improbable.gdk.core": "0.1.1"
+        "com.improbable.gdk.core": "0.1.2"
     }
 }
diff --git a/workers/unity/Packages/com.improbable.gdk.movement/package.json b/workers/unity/Packages/com.improbable.gdk.movement/package.json
@@ -1,12 +1,12 @@
 {
     "name": "com.improbable.gdk.movement",
     "displayName": "SpatialOS GDK Movement",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Movement Module. Made by Improbable.",
     "dependencies": {
-        "com.improbable.gdk.core": "0.1.1",
-        "com.improbable.gdk.standardtypes": "0.1.1"
+        "com.improbable.gdk.core": "0.1.2",
+        "com.improbable.gdk.standardtypes": "0.1.2"
     }
 }
diff --git a/workers/unity/Packages/com.improbable.gdk.objectpooling/package.json b/workers/unity/Packages/com.improbable.gdk.objectpooling/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.improbable.gdk.objectpooling",
     "displayName": "SpatialOS GDK Object Pooling",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Object Pooling Module. Made by Improbable.",
diff --git a/workers/unity/Packages/com.improbable.gdk.ragdolls/package.json b/workers/unity/Packages/com.improbable.gdk.ragdolls/package.json
@@ -1,14 +1,14 @@
 {
     "name": "com.improbable.gdk.ragdolls",
     "displayName": "SpatialOS GDK Ragdolls",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Ragdolls Module. Made by Improbable.",
     "dependencies": {
-        "com.improbable.gdk.core": "0.1.1",
-        "com.improbable.gdk.health": "0.1.1",
-        "com.improbable.gdk.objectpooling": "0.1.1",
-        "com.improbable.gdk.standardtypes": "0.1.1"
+        "com.improbable.gdk.core": "0.1.2",
+        "com.improbable.gdk.health": "0.1.2",
+        "com.improbable.gdk.objectpooling": "0.1.2",
+        "com.improbable.gdk.standardtypes": "0.1.2"
     }
 }
diff --git a/workers/unity/Packages/com.improbable.gdk.standardtypes/package.json b/workers/unity/Packages/com.improbable.gdk.standardtypes/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.improbable.gdk.standardtypes",
     "displayName": "SpatialOS GDK Standard Types",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "unity": "2018.2",
     "author": "Improbable Worlds Ltd",
     "description": "SpatialOS GDK Standard Types Module. Made by Improbable.",
diff --git a/workers/unity/ProjectSettings/ProjectVersion.txt b/workers/unity/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.2.8f1
+m_EditorVersion: 2018.2.14f1

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "unity_gdk",`
`3`	`3`	`"project_version": "0.0.1",`
`4`		`- "sdk_version": "14.0-b6143-48ac8-WORKER-SNAPSHOT",`
	`4`	`+ "sdk_version": "14.0-b6841-3d544-WORKER-SNAPSHOT",`
`5`	`5`	`"dependencies": [`
`6`		`- {"name": "standard_library", "version": "14.0-b6143-48ac8-WORKER-SNAPSHOT"}`
	`6`	`+ {"name": "standard_library", "version": "14.0-b6841-3d544-WORKER-SNAPSHOT"}`
`7`	`7`	`]`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected override void HandleWorkerConnectionEstablished()`
`58`	`58`	`base.HandleWorkerConnectionEstablished();`
`59`	`59`	`}`
`60`	`60`
`61`		`- protected override void HandleWorkerConnectionFailure()`
	`61`	`+ protected override void HandleWorkerConnectionFailure(string errorMessage)`
`62`	`62`	`{`
`63`	`63`	`connectionController.OnFailedToConnect();`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-using System.Threading.Tasks;`
	`1`	`+using System.Threading.Tasks;`
`2`	`2`	`using Improbable.Gdk.Core;`
`3`	`3`	`using Improbable.Worker.Core;`
`4`	`4`	`using UnityEngine;`
`5`	`5`
`6`	`6`	`namespace Fps`
`7`	`7`	`{`
`8`		`- public abstract class WorkerConnectorBase : WorkerConnector`
	`8`	`+ public abstract class WorkerConnectorBase : DefaultWorkerConnector`
`9`	`9`	`{`
`10`	`10`	`private const string Small = "small";`
`11`	`11`	`private const string Large = "large";`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.improbable.gdk.guns",`
`3`	`3`	`"displayName": "SpatialOS GDK Guns",`
`4`		`- "version": "0.1.1",`
	`4`	`+ "version": "0.1.2",`
`5`	`5`	`"unity": "2018.2",`
`6`	`6`	`"author": "Improbable Worlds Ltd",`
`7`	`7`	`"description": "SpatialOS GDK Guns Module. Made by Improbable.",`
`8`	`8`	`"dependencies": {`
`9`		`- "com.improbable.gdk.core": "0.1.1",`
`10`		`- "com.improbable.gdk.standardtypes": "0.1.1",`
`11`		`- "com.improbable.gdk.objectpooling": "0.1.1"`
	`9`	`+ "com.improbable.gdk.core": "0.1.2",`
	`10`	`+ "com.improbable.gdk.standardtypes": "0.1.2",`
	`11`	`+ "com.improbable.gdk.objectpooling": "0.1.2"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.improbable.gdk.health",`
`3`	`3`	`"displayName": "SpatialOS GDK Health",`
`4`		`- "version": "0.1.1",`
	`4`	`+ "version": "0.1.2",`
`5`	`5`	`"unity": "2018.2",`
`6`	`6`	`"author": "Improbable Worlds Ltd",`
`7`	`7`	`"description": "SpatialOS GDK Health Module. Made by Improbable.",`
`8`	`8`	`"dependencies": {`
`9`		`- "com.improbable.gdk.core": "0.1.1"`
	`9`	`+ "com.improbable.gdk.core": "0.1.2"`
`10`	`10`	`}`
`11`	`11`	`}`