Merge pull request #24 from croquet/merge-develop

upgrade to package v0.9.3

unity/Assets/CroquetJS/.demolition-three/deploy-croquet-io-dev.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 cd `dirname "$0"`
 
+if [ $1 == "" ] ; then echo "Must supply a version number for deployment (e.g., 1.4)" ; exit 1 ; fi
+
 npm run build-three
 
 SOURCE=build-tools/dist
-TARGET=../../../../../wonderland/servers/croquet-io-dev/demolition-multi
+VERSION=$1
+TARGET=../../../../../wonderland/servers/croquet-io-dev/demolition-multi-$VERSION
 
 rm -rf $TARGET
 mkdir $TARGET

unity/Assets/CroquetJS/.demolition-three/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@croquet/worldcore-demolition-three",
-    "version": "1.3",
+    "version": "1.4",
     "description": "Croquet Demolition demo on THREE",
     "private": true,
     "author": "Croquet Corporation",

unity/Assets/CroquetJS/demolition/Models.js

@@ -20,7 +20,6 @@ export class GameActor extends mix(Actor).with(AM_Spatial, AM_RapierRigidBody) {
     get type() { return this._type || "primitiveCube" }
     get color() { return this._color || [0.5, 0.5, 0.5] }
     get alpha() { return this._alpha === undefined ? 1 : this._alpha }
-    get rigidBodyType() { return this._rigidBodyType }
 }
 GameActor.register('GameActor');
 

unity/Assets/Scripts/ShowQRForSession.cs

@@ -15,18 +15,19 @@ void Start()
     void Update()
     {
         if (CroquetBridge.Instance.croquetSessionState == "running") { // @@ provide static Croquet accessor
+            string RELEASE = "1.4"; // ========= UPDATE THIS =========
             string localReflector = PlayerPrefs.GetString("sessionIP", "");
             string sessionNameValue = CroquetBridge.Instance.sessionName;
             string url;
             if (localReflector == "")
             {
                 // Debug.Log("local reflector session ip setting empty, using live croquet network");
-                url = $"https://croquet.io/demolition-multi/?q={sessionNameValue}";
+                url = $"https://croquet.io/demolition-multi-{RELEASE}/?q={sessionNameValue}";
             }
             else
             {
                 // Debug.Log("local reflector session ip setting found, using set ip");
-                url = $"http://{localReflector}/demolition-multi?q={sessionNameValue}&reflector=ws://{localReflector}/reflector&files=http://{localReflector}/files";
+                url = $"http://{localReflector}/demolition-multi-{RELEASE}?q={sessionNameValue}&reflector=ws://{localReflector}/reflector&files=http://{localReflector}/files";
             }
 
             string reflectorMsg = localReflector == "" ? "" : $" on reflector {localReflector}";

unity/Packages/manifest.json

@@ -4,15 +4,14 @@
     "com.unity.addressables": "1.19.19",
     "com.unity.collab-proxy": "2.0.0",
     "com.unity.ide.rider": "3.0.21",
-    "com.unity.ide.visualstudio": "2.0.17",
-    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.inputsystem": "1.5.0",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
-    "io.croquet.multiplayer": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.0",
+    "io.croquet.multiplayer": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.3",
     "net.gree.unity-webview": "https://github.com/gree/unity-webview.git?path=/dist/package-nofragment",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

unity/Packages/packages-lock.json

@@ -44,21 +44,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.inputsystem": {
       "version": "1.5.0",
       "depth": 0,
@@ -127,21 +120,21 @@
       "url": "https://packages.unity.com"
     },
     "io.croquet.multiplayer": {
-      "version": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.0",
+      "version": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.3",
       "depth": 0,
       "source": "git",
       "dependencies": {
         "com.unity.addressables": "1.19.19",
         "com.unity.inputsystem": "1.5.0"
       },
-      "hash": "9bddf70f2e43a0ef777ac04e8fcf6a15bfcc322e"
+      "hash": "bbee80e755e85fbc0ec84fe4d02682df676d650f"
     },
     "net.gree.unity-webview": {
       "version": "https://github.com/gree/unity-webview.git?path=/dist/package-nofragment",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "3647674386e3c844aa416fc744905b8286c56616"
+      "hash": "ac07c49acc27e72b2939c4be70bd5d05b1308855"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",