Merged upstream and moved demo mode into cli argument

Author: bitsandfoxes

Assets/Scripts/Weapons/Dart/Dart.cs

@@ -159,21 +159,23 @@ private void ShootADart(DartProjectile prefab, GameObject player, Vector3 direct
 
     private Vector3 CalculateDirection(GameObject player)
     {
-        if (Gamepad.current != null)
+        // Use gamepad right stick if it's actively being used
+        var stickDirection = _lookAction.ReadValue<Vector2>();
+        if (stickDirection.magnitude >= 0.1f)
         {
-            var direction = _lookAction.ReadValue<Vector2>(); 
-            if (direction.magnitude < 0.1f)
-            {
-                // Don't change it if we're not aiming
-                return _shootingDirection;
-            }
+            return stickDirection;
+        }
 
-            return direction;
+        // On desktop, fall through to mouse aiming
+        if (Application.platform != RuntimePlatform.Android &&
+            Application.platform != RuntimePlatform.IPhonePlayer)
+        {
+            var mousePosition = Camera.main.ScreenToWorldPoint(_mouseAction.ReadValue<Vector2>());
+            var targetDirection = mousePosition - player.transform.position;
+            return targetDirection;
         }
-        
-        var mousePosition = Camera.main.ScreenToWorldPoint(_mouseAction.ReadValue<Vector2>());
-        var targetDirection = mousePosition - player.transform.position;
-        
-        return targetDirection;
+
+        // On mobile with no stick input, keep current direction
+        return _shootingDirection;
     }
 }

Assets/Scripts/Weapons/Schnitzel/Schnitzel.cs

@@ -62,22 +62,24 @@ public IEnumerator ShootSchnitzels(GameObject player)
 
     private Vector3 CalculateDirection(GameObject player)
     {
-        if (Gamepad.current != null)
+        // Use gamepad right stick if it's actively being used
+        var stickDirection = _lookAction.ReadValue<Vector2>();
+        if (stickDirection.magnitude >= 0.1f)
         {
-            var direction = _lookAction.ReadValue<Vector2>(); 
-            if (direction.magnitude < 0.1f)
-            {
-                // Don't change it if we're not aiming
-                return _shootingDirection;
-            }
-
-            return direction;
+            return stickDirection;
         }
-        
-        var mousePosition = Camera.main.ScreenToWorldPoint(_mouseAction.ReadValue<Vector2>());
-        var targetDirection = mousePosition - player.transform.position;
-        
-        return targetDirection;
+
+        // On desktop, fall through to mouse aiming
+        if (Application.platform != RuntimePlatform.Android &&
+            Application.platform != RuntimePlatform.IPhonePlayer)
+        {
+            var mousePosition = Camera.main.ScreenToWorldPoint(_mouseAction.ReadValue<Vector2>());
+            var targetDirection = mousePosition - player.transform.position;
+            return targetDirection;
+        }
+
+        // On mobile with no stick input, keep current direction
+        return _shootingDirection;
     }
 
     private void ShootOneSchnitzel(SchnitzelProjectile prefab, GameObject player, Vector3 direction)

Packages/manifest.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "2.10.2",
+    "com.unity.collab-proxy": "2.11.3",
     "com.unity.feature.2d": "2.0.2",
-    "com.unity.ide.rider": "3.0.38",
+    "com.unity.ide.rider": "3.0.39",
     "com.unity.ide.visualstudio": "2.0.26",
-    "com.unity.inputsystem": "1.17.0",
-    "com.unity.mobile.android-logcat": "1.4.6",
+    "com.unity.inputsystem": "1.18.0",
+    "com.unity.mobile.android-logcat": "1.4.7",
     "com.unity.multiplayer.center": "1.0.1",
     "com.unity.render-pipelines.universal": "17.3.0",
     "com.unity.test-framework": "1.6.0",

Packages/packages-lock.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.2d.animation": {
-      "version": "13.0.2",
+      "version": "13.0.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.common": "12.0.1",
+        "com.unity.2d.common": "12.0.2",
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.collections": "2.4.3",
         "com.unity.modules.animation": "1.0.0",
@@ -27,7 +27,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.common": {
-      "version": "12.0.1",
+      "version": "12.0.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -99,11 +99,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.tooling": {
-      "version": "1.0.0",
+      "version": "1.0.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.common": "12.0.1",
+        "com.unity.2d.common": "12.0.2",
         "com.unity.modules.uielements": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -119,7 +119,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "2.10.2",
+      "version": "2.11.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -149,19 +149,19 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.2d.animation": "13.0.2",
+        "com.unity.2d.animation": "13.0.4",
         "com.unity.2d.pixel-perfect": "5.1.1",
         "com.unity.2d.psdimporter": "12.0.1",
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.2d.spriteshape": "13.0.0",
         "com.unity.2d.tilemap": "1.0.0",
         "com.unity.2d.tilemap.extras": "6.0.1",
         "com.unity.2d.aseprite": "3.0.1",
-        "com.unity.2d.tooling": "1.0.0"
+        "com.unity.2d.tooling": "1.0.2"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.38",
+      "version": "3.0.39",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -179,7 +179,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.inputsystem": {
-      "version": "1.17.0",
+      "version": "1.18.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -195,7 +195,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mobile.android-logcat": {
-      "version": "1.4.6",
+      "version": "1.4.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {},

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.3.3f1
-m_EditorVersionWithRevision: 6000.3.3f1 (ef04196de0d6)
+m_EditorVersion: 6000.3.8f1
+m_EditorVersionWithRevision: 6000.3.8f1 (1c7db571dde0)