merged & fix conflicts from master

This commit is contained in:
Nixon 2022-08-26 22:00:25 +08:00
commit f1e88d3460
10 changed files with 1135 additions and 202 deletions

25
Cargo.lock generated
View file

@ -588,6 +588,25 @@ dependencies = [
"glam",
]
[[package]]
name = "bevy_mod_picking"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db42ac84b1409452bbfa696d9071b9a7a2505c73620c939b758b5bf23573976a"
dependencies = [
"bevy",
"bevy_mod_raycast",
]
[[package]]
name = "bevy_mod_raycast"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aead49a20f5e694f4fb59c7312f9a1813b65a2a0ac2c385d53d40f25cae896f"
dependencies = [
"bevy",
]
[[package]]
name = "bevy_pbr"
version = "0.8.1"
@ -911,6 +930,7 @@ dependencies = [
"bevy",
"bevy-inspector-egui",
"bevy_common_assets",
"bevy_mod_picking",
"bevy_rapier2d",
"cpal 0.14.0",
"crossbeam-channel",
@ -919,6 +939,7 @@ dependencies = [
"rand_distr",
"rapier2d",
"serde",
"serde_json",
"ticktock",
]
@ -1563,9 +1584,9 @@ dependencies = [
[[package]]
name = "erased-serde"
version = "0.3.22"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "003000e712ad0f95857bd4d2ef8d1890069e06554101697d12050668b2f6f020"
checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11"
dependencies = [
"serde",
]