Merge remote-tracking branch 'upstream/main' into motion-blur

bevyengine · Feb 25, 2024 · 5c117ed · 5c117ed
2 parents 79ec4c2 + de004da
commit 5c117ed
Show file tree

Hide file tree

Showing 530 changed files with 16,802 additions and 8,167 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -168,19 +168,20 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - name: Install taplo
-        run: | 
-          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
-          | gzip -d - \
-          | install -m 755 /dev/stdin /usr/local/bin/taplo
+        run: cargo install taplo-cli --locked
       - name: Run Taplo
         id: taplo
         run: taplo fmt --check --diff
       - name: Taplo info
         if: failure()
         run: |
           echo 'To fix toml fmt, please run `taplo fmt`'
-          echo 'Or if you use VSCode, use the Even Better Toml extension'
+          echo 'To check for a diff, run `taplo fmt --check --diff'
+          echo 'You can find taplo here: https://taplo.tamasfe.dev/'
+          echo 'Or if you use VSCode, use the `Even Better Toml` extension with 2 spaces'
+          echo 'You can find the extension here: https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml'
 
 
   run-examples-on-windows-dx12:

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -49,7 +49,7 @@ jobs:
             --exclude build-wasm-example
 
       - name: Create PR
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           delete-branch: true
           base: "main"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
             --exclude build-wasm-example
 
       - name: Create PR
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           delete-branch: true
           base: "main"

diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@ dxil.dll
 # Generated by "examples/scene/scene.rs"
 assets/scenes/load_scene_example-new.scn.ron
 
+# Generated by "examples/window/screenshot.rs"
+**/screenshot-*.png
+
 assets/**/*.meta
 crates/bevy_asset/imported_assets
 imported_assets