Merge branch 'main' into custom_render_phase

.github/workflows/ci.yml

@@ -126,7 +126,6 @@ jobs:
       - name: Check Compile
         # See tools/ci/src/main.rs for the commands this runs
         run: cargo run -p ci -- compile
-
   check-compiles-no-std:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -242,7 +241,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Check for typos
-        uses: crate-ci/[email protected].2
+        uses: crate-ci/[email protected].3
       - name: Typos info
         if: failure()
         run: |
@@ -295,7 +294,6 @@ jobs:
         with:
           name: example-run-macos
           path: example-run/
-
   check-doc:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -310,9 +308,7 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }}
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@stable
       - name: Install Linux dependencies
         uses: ./.github/actions/install-linux-deps
         with:
@@ -323,7 +319,7 @@ jobs:
         run: cargo run -p ci -- doc
         env:
           CARGO_INCREMENTAL: 0
-          RUSTFLAGS: "-C debuginfo=0 --cfg docsrs_dep"
+          RUSTFLAGS: "-C debuginfo=0"
       # This currently report a lot of false positives
       # Enable it again once it's fixed - https://github.com/bevyengine/bevy/issues/1983
       # - name: Installs cargo-deadlinks

CONTRIBUTING.md

@@ -1,3 +1,4 @@
 # Contributing to Bevy
 
-Hey, we've moved our information on contributing to Bevy's website [here](https://bevyengine.org/learn/contribute/introduction). Go give it a read, and thanks for contributing!
+If you'd like to help build Bevy, start by reading this
+[introduction](https://bevyengine.org/learn/contribute/introduction). Thanks for contributing!

Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bevyengine/bevy"
 documentation = "https://docs.rs/bevy"
-rust-version = "1.82.0"
+rust-version = "1.83.0"
 
 [workspace]
 exclude = [
@@ -451,7 +451,7 @@ ios_simulator = ["bevy_internal/ios_simulator"]
 # Enable built in global state machines
 bevy_state = ["bevy_internal/bevy_state"]
 
-# Enables source location tracking for change detection, which can assist with debugging
+# Enables source location tracking for change detection and spawning/despawning, which can assist with debugging
 track_change_detection = ["bevy_internal/track_change_detection"]
 
 # Enable function reflection
@@ -996,7 +996,7 @@ doc-scrape-examples = true
 name = "Motion Blur"
 description = "Demonstrates per-pixel motion blur"
 category = "3D Rendering"
-wasm = false
+wasm = true
 
 [[example]]
 name = "order_independent_transparency"
@@ -3862,6 +3862,18 @@ description = "Demonstrates percentage-closer soft shadows (PCSS)"
 category = "3D Rendering"
 wasm = false
 
+[[example]]
+name = "mixed_lighting"
+path = "examples/3d/mixed_lighting.rs"
+doc-scrape-examples = true
+required-features = ["jpeg"]
+
+[package.metadata.example.mixed_lighting]
+name = "Mixed lighting"
+description = "Demonstrates how to combine baked and dynamic lighting"
+category = "3D Rendering"
+wasm = true
+
 [[example]]
 name = "animated_ui"
 path = "examples/animation/animated_ui.rs"
@@ -3948,3 +3960,14 @@ doc-scrape-examples = true
 
 [package.metadata.example.testbed_ui_layout_rounding]
 hidden = true
+
+[[example]]
+name = "tab_navigation"
+path = "examples/ui/tab_navigation.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.tab_navigation]
+name = "Tab Navigation"
+description = "Demonstration of Tab Navigation"
+category = "UI (User Interface)"
+wasm = true