merge: merge branch 'dev' into drag-fix

Astrabit-ST · Mar 25, 2024 · 6217ef7 · 6217ef7
2 parents 746d8d0 + 5cbe458
commit 6217ef7
Show file tree

Hide file tree

Showing 62 changed files with 2,427 additions and 1,836 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -24,3 +24,6 @@ rustflags = [
 	"-Z",
 	"threads=8",
 ]
+
+[env]
+LUMINOL_ASSETS_PATH = { value = "assets", relative = true }
diff --git a/.github/workflows/build-steam.yml b/.github/workflows/build-steam.yml
@@ -23,7 +23,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
@@ -48,7 +48,7 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
@@ -73,7 +73,7 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
@@ -46,7 +46,7 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
@@ -70,7 +70,7 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
@@ -98,7 +98,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
           targets: wasm32-unknown-unknown
           components: rust-src
       - name: Download and install Trunk binary

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -27,7 +27,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - run: cargo check --all-features 
@@ -45,7 +45,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
           targets: wasm32-unknown-unknown
           components: rust-src
       - name: Rust Cache
@@ -64,7 +64,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - run: cargo test --workspace 
@@ -82,7 +82,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
           components: rustfmt
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -101,7 +101,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-11-14
+          toolchain: nightly-2024-02-01
           components: clippy
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@ steamworks/*
 !steamworks/redistributable_bin
 #! renderdoc
 captures/
+
+rustc-ice*
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,3 +24,6 @@ rustflags = [ @@
     	"-Z",
     	"threads=8",
     ]
+    [env]
+    LUMINOL_ASSETS_PATH = { value = "assets", relative = true }