Merge branch 'develop' into tmp/sprite-prototype

Author: 12joan

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpierabs": {
+      "version": "1.0.4",
+      "commands": [
+        "csharpier-abs"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/lint.yml

@@ -10,5 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
-      - run: yarn lint:all
+          dotnet-version: '8.0.x'
+      - run: dotnet tool restore
+      - run: yarn lint

.github/workflows/steam.yml

@@ -18,7 +18,8 @@ name: Upload to Steam
 #    intend to use include the Pop Pixie app and both depots created in step 1.
 # 6. Follow the steps in https://game.ci/docs/github/deployment/steam/#4-setup-steam-authentication
 #    and create the STEAM_USERNAME, and STEAM_CONFIG_VDF and STEAM_APP_ID
-#    secrets as required.
+#    secrets as required. If on macOS, the config.vdf file may be placed in
+#    ~/Library/Application Support/Steam/config/config.vdf.
 
 on: workflow_call
 

.github/workflows/windows.yml

@@ -27,7 +27,7 @@ jobs:
   package_windows:
     name: Package Windows build
     needs: build
-    runs-on: windows-latest
+    runs-on: windows-2025
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
           path: public
 
       - name: Compile installer
-        uses: anderbellstudios/Inno-Setup-Action@main
+        uses: Minionguyjpro/Inno-Setup-Action@11b1cb96144a501c6580661c8d0bdf4bb790171c
         with:
           path: ./installers/windows/pop-pixie.iss
           options: /O+

.gitignore

@@ -4,6 +4,9 @@
 /Logs/
 /UserSettings/
 
+*.csproj
+!pop-pixie.csproj
+
 /yarn-error.log
 /node_modules
 

.husky/pre-commit

@@ -0,0 +1,2 @@
+yarn lint:fix
+git update-index --again

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+      "visualstudiotoolsforunity.vstuc"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,10 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Unity",
+            "type": "vstuc",
+            "request": "attach"
+        }
+     ]
+}

.vscode/settings.json

@@ -0,0 +1,70 @@
+{
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.vs": true,
+        "**/.gitmodules": true,
+        "**/.vsconfig": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "Logs/": true,
+        "logs/": true,
+        "ProjectSettings/": true,
+        "UserSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "files.associations": {
+        "*.asset": "yaml",
+        "*.meta": "yaml",
+        "*.prefab": "yaml",
+        "*.unity": "yaml",
+    },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.patterns": {
+        "*.sln": "*.csproj",
+    },
+    "dotnet.defaultSolution": "pop-pixie.sln"
+}

Assets/Editor/DevelopmentBuild.cs

@@ -1,18 +1,18 @@
 /**
  * MIT License
- * 
+ *
  * Copyright (c) 2020-present GameCI, Anderbell Studios
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,13 +35,10 @@ public static class DevelopmentBuild {
   public static void Build() {
     ParseCommandLineArguments(out Dictionary<string, string> options);
 
-    BuildTarget buildTarget = (BuildTarget) Enum.Parse(
-      typeof(BuildTarget),
-      options["buildTarget"]
-    );
+    BuildTarget buildTarget = (BuildTarget)Enum.Parse(typeof(BuildTarget), options["buildTarget"]);
 
-    List<string> scenes = EditorBuildSettings.scenes
-      .Where(scene => scene.enabled)
+    List<string> scenes = EditorBuildSettings
+      .scenes.Where(scene => scene.enabled)
       .Select(scene => scene.path)
       .ToList();
 
@@ -57,7 +54,7 @@ public static void Build() {
       scenes = scenes.ToArray(),
       locationPathName = options["customBuildPath"],
       target = buildTarget,
-      options = UnityEditor.BuildOptions.Development
+      options = UnityEditor.BuildOptions.Development,
     };
 
     BuildMetaData.SetBranchName(options["branchName"]);
@@ -85,7 +82,8 @@ private static void ParseCommandLineArguments(out Dictionary<string, string> pro
 
       // Ignore arguments not starting with '-'
       bool isFlag = args[current].StartsWith("-");
-      if (!isFlag) continue;
+      if (!isFlag)
+        continue;
 
       string flag = args[current].TrimStart('-');