Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bevy 0.14.2 #332

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,702 changes: 1,144 additions & 558 deletions Cargo.lock

Large diffs are not rendered by default.

51 changes: 25 additions & 26 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@ dev = [
tracing = ["bevy/trace_chrome"]

[dependencies.bevy]
version = "0.13"
version = "0.14.2"
features = [
"jpeg",
"bevy_state",
]

[dependencies]
# keep the following in sync with Bevy's dependencies
## https://github.com/bevyengine/bevy/blob/v0.13.1/crates/bevy_winit/Cargo.toml#L32
winit = { version = "0.29", default-features = false }
winit = { version = "0.30", default-features = false }
## https://github.com/bevyengine/bevy/blob/v0.13.1/crates/bevy_render/Cargo.toml#L61
image = { version = "0.24", default-features = false }
image = { version = "0.25.2", default-features = false }
## This greatly improves WGPU's performance due to its heavy use of trace! calls
log = { version = "0.4", features = ["max_level_debug", "release_max_level_warn"] }

Expand All @@ -41,25 +42,23 @@ serde = { version = "1", features = ["derive"] }
anyhow = "1"

# Bevy plugins
bevy_kira_audio = "0.19"
bevy_asset_loader = { version = "0.20", features = ["progress_tracking", "standard_dynamic_assets"] }
bevy_common_assets = { version = "0.10", features = ["ron", "toml"] }
bevy_egui = "0.25" # version governed by bevy_editor_pls and leafwing-input-manager
oxidized_navigation = { version = "0.10", features = ["xpbd"] }
iyes_progress = "0.11"
leafwing-input-manager = { version = "0.13", features = ["egui"] }
bevy_dolly = "0.0.3"
bevy_editor_pls = { version = "0.8.1", optional = true }
bevy_hanabi = { version = "0.11", default-features = false, features = ["3d"] }
bevy_yarnspinner = "0.2"
bevy_yarnspinner_example_dialogue_view = "0.2.1"
bevy-tnua-xpbd3d = "0.4"
bevy_xpbd_3d = { version = "0.4", features = ["simd"] }
bevy-tnua = "0.18"
bevy_atmosphere = "0.9"
warbler_grass = "0.6"
bevy_gltf_blueprints = "0.10"
bevy_registry_export = "0.3"
bevy_kira_audio = "0.20"
bevy_asset_loader = { version = "0.21", features = ["progress_tracking", "standard_dynamic_assets"] }
bevy_common_assets = { version = "0.11", features = ["ron", "toml"] }
bevy_egui = "=0.28" # version governed by bevy_editor_pls and leafwing-input-manager
oxidized_navigation = { version = "0.11", default-features = false, features = ["xpbd"] }
iyes_progress = "0.12"
leafwing-input-manager = { version = "=0.14.0", features = ["egui"] }
bevy_dolly = "0.0.4"
bevy_editor_pls = { version = "0.9", optional = true }
bevy_hanabi = { version = "0.13.1", default-features = false, features = ["3d"] }
bevy_yarnspinner = "0.3.1"
bevy_yarnspinner_example_dialogue_view = "0.3.0"
bevy-tnua-xpbd3d = "0.5"
bevy_xpbd_3d = { version = "0.5", features = ["simd"] }
bevy-tnua = "0.20"
bevy_atmosphere = "0.10"
blenvy = { git = "https://github.com/kaosat-dev/Blenvy" }

[build-dependencies]
embed-resource = "2"
Expand All @@ -84,12 +83,12 @@ strip = true
# Note that windows still uses syn 1 through
# * com-macros and com_macros_support (unlikely to receive updates)
# * windows-implement and windows-interface (updated to syn 2 in Bevy 0.14.0-rc.2)
egui_dock = { git = "https://github.com/bash/egui_dock.git", branch = "backport-syn-update" } # This change is not PR-worthy. Instead, I made a PR to the actually affected dependency `duplicate`: https://github.com/Emoun/duplicate/pull/62
#egui_dock = { git = "https://github.com/bash/egui_dock.git", branch = "backport-syn-update" } # This change is not PR-worthy. Instead, I made a PR to the actually affected dependency `duplicate`: https://github.com/Emoun/duplicate/pull/62

# These patches mainly remove strum and are included in bevy_yarnspinner 0.3.0-rc
bevy_yarnspinner = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }
bevy_yarnspinner_example_dialogue_view = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }
#bevy_yarnspinner = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }
#bevy_yarnspinner_example_dialogue_view = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }

# Bug fixes
bevy_hanabi = { git = "https://github.com/djeedai/bevy_hanabi/", rev = "b9a98bdf51be07f8127d2f16b68f1eb86259242f" }
#bevy_hanabi = { git = "https://github.com/djeedai/bevy_hanabi/", rev = "b9a98bdf51be07f8127d2f16b68f1eb86259242f" }

Binary file modified assets/scenes/World.glb
Binary file not shown.
Binary file modified assets/scenes/level.blend
Binary file not shown.
Binary file modified assets/scenes/library/Fox.glb
Binary file not shown.
Binary file modified assets/scenes/library/House.glb
Binary file not shown.
Binary file modified assets/scenes/library/Orb.glb
Binary file not shown.
Loading