gg.easy.airship 0.1.2122 → 0.1.2124

package/Editor/CreateAssetBundles.cs

@@ -311,14 +311,24 @@ public static class CreateAssetBundles {
 		foreach (var assetBundleFile in AirshipPackagesWindow.assetBundleFiles) {
 			var assetBundleName = assetBundleFile.ToLower();
 			if (assetBundleName == "shared/scenes") {
-				string[] assetPaths = gameConfig.gameScenes
-					.Select((s) => AssetDatabase.GetAssetPath((SceneAsset)s))
+				var assetGuids = gameConfig.gameScenes
+					.Select((s) => AssetDatabase.GetAssetPath((SceneAsset)s)).ToHashSet();
+
+				var explicitlyAddedPaths = AssetDatabase.GetAssetPathsFromAssetBundle("scenes");
+				Debug.Log($"Found {explicitlyAddedPaths.Length} explicit assets for scenes bundle.");
+				foreach (var path in explicitlyAddedPaths) {
+					// Debug.Log("  - " + path);
+					assetGuids.Add(AssetDatabase.AssetPathToGUID(path));
+				}
+
+				string[] assetPaths = assetGuids
 					.Where((path) => !(path.EndsWith(".lua") || path.EndsWith(".json~")))
 					.ToArray();
-				// Debug.Log("Including scenes: ");
-				// foreach (var p in assetPaths) {
-				// 	Debug.Log("  - " + p);
-				// }
+				Debug.Log("Including assets in scenes bundle:");
+				foreach (var p in assetPaths) {
+					Debug.Log("  - " + p);
+				}
+
 				var addressableNames = assetPaths.Select((p) => p.ToLower())
 					.ToArray();
 				var build = new AssetBundleBuild() {

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -395,9 +395,11 @@ namespace Editor.Packages {
 
             // Uncomment to just build iOS
             if (isCoreMaterials) {
-                platforms.Clear();
-                // platforms.Add(AirshipPlatform.iOS);
-                platforms.Add(AirshipPlatform.Android);
+            //     platforms.Clear();
+            //     platforms.Add(AirshipPlatform.iOS);
+            //     platforms.Add(AirshipPlatform.Android);
+                platforms.Add(AirshipPlatform.Windows);
+                platforms.Add(AirshipPlatform.Mac);
             }
 
             if (!CreateAssetBundles.PrePublishChecks()) {

package/Runtime/Code/Components/EditorScreenShotTool.cs

@@ -27,23 +27,23 @@ namespace Code.Components {
         }
 
         private void Update(){
-            if(Input.GetMouseButtonDown(0)) { // capture screen shot on left mouse button down
-                if(transparentBackground){
-                    TakeScreenshotRenderTransparent();
-                } else{
-                    TakeScreenshotRender();
-                }
-            }
+            // if(Input.GetMouseButtonDown(0)) { // capture screen shot on left mouse button down
+            //     if(transparentBackground){
+            //         TakeScreenshotRenderTransparent();
+            //     } else{
+            //         TakeScreenshotRender();
+            //     }
+            // }
         }
 
-        public void TakeScreenshotRender(){
+        public void TakeScreenshotRender() {
             var folderPath = CreateFolder();
             var screenshotName = GetFileName();
             ScreenCapture.CaptureScreenshot(Path.Combine(folderPath, screenshotName), superScaleSize); // takes the sceenshot, the "2" is for the scaled resolution, you can put this to 600 but it will take really long to scale the image up
             Debug.Log("Saved screenshot to: " + folderPath + screenshotName); // You get instant feedback in the console
         }
 
-        public void TakeScreenshotRenderTransparent(){
+        public void TakeScreenshotRenderTransparent() {
             var folderPath = CreateFolder();
             var screenshotName = GetFileName();
 

package/Runtime/Code/Components/EditorScreenShotToolEditor.cs

@@ -0,0 +1,25 @@
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEngine;
+
+namespace Code.Components {
+    [CustomEditor(typeof(EditorScreenShotTool))]
+    public class EditorScreenShotToolEditor : Editor {
+        public override void OnInspectorGUI() {
+            // Draw default inspector first
+            DrawDefaultInspector();
+
+            EditorScreenShotTool tool = (EditorScreenShotTool)target;
+
+            GUILayout.Space(10);
+            if (GUILayout.Button("Take Screenshot")) {
+                if (tool.transparentBackground) {
+                    tool.TakeScreenshotRenderTransparent();
+                } else {
+                    tool.TakeScreenshotRender();
+                }
+            }
+        }
+    }
+}
+#endif

package/Runtime/Code/Components/EditorScreenShotToolEditor.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9fb53f9283df448db6f3c9c9798e541a
+timeCreated: 1745520453

package/Runtime/Code/Player/Accessories/AccessorySlot.cs

@@ -32,6 +32,10 @@ namespace Code.Player.Accessories {
         LeftArmUpper,
         LeftArmLower,
         RightArmUpper,
-        RightArmLower
+        RightArmLower,
+        RightShoulder,
+        LeftShoulder,
+        FrontChest,
+        BackChest
     }
 }    

package/Runtime/Code/Player/Character/CharacterRig.cs

@@ -57,8 +57,13 @@ public class CharacterRig : MonoBehaviour {
 	public Transform headTop;
 	public Transform neck;
 	public Transform spineChest;
-	public Transform heldItemL;
+    public Transform chestBack;
+    public Transform chestFront;
+    public Transform heldItemL;
 	public Transform heldItemR;
+    public Transform shoulderItemL;
+    public Transform shoulderItemR;
+
 
     [Header("Color")] public MaterialColorURP headColor;
     public MaterialColorURP bodyColor;
@@ -99,6 +104,10 @@ public class CharacterRig : MonoBehaviour {
 
                 //TORSO
                 case AccessorySlot.Torso:
+                case AccessorySlot.FrontChest:
+                    return chestFront;
+                case AccessorySlot.BackChest:
+                    return chestBack;
                 case AccessorySlot.TorsoInner:
                 case AccessorySlot.TorsoOuter:
                     return spine;
@@ -119,6 +128,10 @@ public class CharacterRig : MonoBehaviour {
                     return upperArmL;
                 case AccessorySlot.LeftArmLower:
                     return forearmL;
+                case AccessorySlot.LeftShoulder:
+                    return shoulderItemL;
+                case AccessorySlot.RightShoulder:
+                    return shoulderItemR;
                 case AccessorySlot.RightArmUpper:
                     return upperArmR;
                 case AccessorySlot.RightArmLower:

package/Runtime/Code/Player/Character/MovementSystem/CharacterMovement.cs

@@ -447,7 +447,12 @@ public class CharacterMovement : NetworkBehaviour {
             currentMoveState.jumpCount = 0;
             currentMoveState.timeSinceBecameGrounded = 0f;
             OnImpactWithGround?.Invoke(currentVelocity, groundHit);
-            CommandImpactWithGround(currentVelocity, groundHit);
+            if (isClientOnly) {
+                CommandImpactWithGround(currentVelocity, groundHit);
+            }
+            else {
+                RpcImpactWithGround(currentVelocity, groundHit);
+            }
         } else {
             currentMoveState.timeSinceBecameGrounded
                 = Math.Min(currentMoveState.timeSinceBecameGrounded + deltaTime, 100f);
@@ -853,8 +858,8 @@ public class CharacterMovement : NetworkBehaviour {
                 //Push the character out of any colliders
                 flatVelocity
                     = Vector3.ClampMagnitude(newVelocity, forwardHit.distance - characterRadius - forwardMargin);
-                newVelocity.x = flatVelocity.x;
-                newVelocity.z = flatVelocity.z;
+                newVelocity.x += flatVelocity.x;
+                newVelocity.z += flatVelocity.z;
             }
 
             if (!grounded && detectedGround) {
@@ -1429,4 +1434,4 @@ public class CharacterMovement : NetworkBehaviour {
     {
         OnJumped?.Invoke(jumpVelocity);
     }
-}
+}

package/Runtime/DevConsole/Runtime/DevConsoleMono.cs

@@ -950,6 +950,11 @@ namespace Airship.DevConsole
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void Log(object message, LogContext context = LogContext.Client, bool prepend = false) {
+            string s = message.ToString();
+            if (s.Contains("The character with Unicode value")) {
+                return;
+            }
+            
             Profiler.BeginSample("DevConsole.Log");
             var list = StoredLogText[context];
             if (list.Count >= 100) {
@@ -994,10 +999,6 @@ namespace Airship.DevConsole
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void LogWarning(object message, LogContext context = LogContext.Client, bool prepend = false) {
-            string s = message.ToString();
-            if (s.Contains("The character with Unicode value ")) {
-                return;
-            }
             Log(message, context, prepend, WarningColour);
         }
 
@@ -2955,6 +2956,11 @@ namespace Airship.DevConsole
                 ));
 
             #endregion
+
+            AddCommand(Command.Create("lighting", "", "View lighting data", () => {
+                Debug.Log("Lightmaps: " + LightmapSettings.lightmaps.Length);
+                Debug.Log("Probes: " + LightmapSettings.lightProbes?.count);
+            }));
         }
 
         /// <summary>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2122",
+  "version": "0.1.2124",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",