refactor: better countdown & rotation camera

MechanicalFlower · Jan 14, 2024 · 128dad3 · 128dad3
1 parent 41b766d
commit 128dad3
Show file tree

Hide file tree

Showing 18 changed files with 327 additions and 194 deletions.
diff --git a/.env b/.env
@@ -2,10 +2,10 @@
 
 # Godot
 
-GODOT_VERSION=4.2.1
+GODOT_VERSION=4.2.1-stable
 
 # Game
 
 GAME_NAME=Marble
-GAME_VERSION=1.4.5
+GAME_VERSION=1.4.6
 GAME_ITCHIO_KEY=marble
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,35 +1,35 @@
 {
-    "regexManagers": [
-      {
-        "fileMatch": ["^plug\\.gd$"],
-        "matchStrings": [
-            "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"commit\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
-        ],
-        "depNameTemplate": "{{{gitUrl}}}",
-        "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
-        "versioningTemplate": "git",
-        "datasourceTemplate": "git-refs"
-      },
-      {
-        "fileMatch": ["^plug\\.gd$"],
-        "matchStrings": [
-            "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"tag\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
-        ],
-        "depNameTemplate": "{{{gitUrl}}}",
-        "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
-        "versioningTemplate": "git",
-        "datasourceTemplate": "git-tags"
-      },
-      {
-        "fileMatch": ["^.env$"],
-        "matchStrings": [
-            "GODOT_VERSION=(?<currentValue>.*?)\\n"
-        ],
-        "depNameTemplate": "godotengine/godot",
-        "packageNameTemplate": "https://github.com/godotengine/godot",
-        "versioningTemplate": "loose",
-        "extractVersionTemplate": "^(?<version>.*)-stable$",
-        "datasourceTemplate": "git-tags"
-      }
-    ]
+  "regexManagers": [
+    {
+      "fileMatch": ["^plug\\.gd$"],
+      "matchStrings": [
+          "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"commit\":\\ \"(?<currentValue>)(?<currentDigest>.*)\""
+      ],
+      "depNameTemplate": "{{{gitUrl}}}",
+      "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
+      "versioningTemplate": "git",
+      "datasourceTemplate": "git-refs"
+    },
+    {
+      "fileMatch": ["^plug\\.gd$"],
+      "matchStrings": [
+          "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"tag\":\\ \"(?<currentValue>.*)\""
+      ],
+      "depNameTemplate": "{{{gitUrl}}}",
+      "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
+      "versioningTemplate": "git",
+      "datasourceTemplate": "git-tags"
+    },
+    {
+      "fileMatch": ["^.env$"],
+      "matchStrings": [
+          "GODOT_VERSION=(?<currentValue>.*?)\\n"
+      ],
+      "depNameTemplate": "godotengine/godot",
+      "packageNameTemplate": "https://github.com/godotengine/godot",
+      "versioningTemplate": "loose",
+      "extractVersionTemplate": "^(?<version>.*)$",
+      "datasourceTemplate": "git-tags"
+    }
+  ]
 }
diff --git a/.github/workflows/release-packaging.yml b/.github/workflows/release-packaging.yml
@@ -19,13 +19,8 @@ jobs:
       - name: Load dotenv
         run: just ci-load-dotenv
 
-      # Retry multiple times, sometimes in CI, gdlint raise "file exists"
       - name: Check
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 1
-          max_attempts: 3
-          command: just fmt
+        run: just fmt
 
       - name: Ensure version is equal to tag
         if: startsWith(github.ref, 'refs/tags/')
@@ -44,6 +39,14 @@ jobs:
       - name: Load dotenv
         run: just ci-load-dotenv
 
+      - name: Cache Godot
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.mkflower/bin
+            ~/.local/share/godot/export_templates
+          key: ${{ env.godot_version }}
+
       - name: Export
         run: just export
 
@@ -65,6 +68,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: extractions/setup-just@v1
 
+      - name: Cache Godot
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.mkflower/bin
+            ~/.local/share/godot/export_templates
+          key: ${{ env.godot_version }}
+
       - name: Load dotenv
         run: just ci-load-dotenv
 
@@ -106,7 +117,7 @@ jobs:
           skip_unpack: false
 
       - name: Publish
-        run: just publish
+        run: just ci-publish
         env:
           BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,6 +21,13 @@ repos:
   rev: v2.2.5
   hooks:
   - id: codespell
+- repo: https://github.com/Scony/godot-gdscript-toolkit
+  rev: 4.2.2
+  hooks:
+  - id: gdformat
+    exclude: '^addons/gd-plug/'
+  - id: gdlint
+    exclude: '^addons/gd-plug/'
 - repo: local
   hooks:
   - id: lower-case-only
@@ -30,26 +37,18 @@ repos:
     files: '[^a-z0-9._/-]'
     exclude: |
       (?x)^(
+          .godot/|
           .reuse/|
-          LICENSES/|
-          public/|
-          Justfile|
-          CONTRIBUTING.md|
+          addons/|
           CHANGELOG.md|
+          CONTRIBUTING.md|
           CREDITS.md|
+          Justfile|
           LICENSE.md|
+          LICENSES/|
+          public/|
           README.md
       )
-  - id: check-gdscript
-    name: check gdscript
-    entry: gdformat
-    language: system
-    files: \.gd$
-    exclude: |
-      (?x)^(
-          addons/|
-          plug.gd
-      )
   - id: check-shaders
     name: check shaders
     entry: clang-format
@@ -60,13 +59,3 @@ repos:
     language: system
     files: \.gdshader$
     exclude: ^addons/
-  - id: lint-gdscript
-    name: lint gdscript
-    entry: gdlint
-    language: system
-    files: \.gd$
-    exclude: |
-      (?x)^(
-          addons/|
-          plug.gd
-      )