Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'a1phyr/assets_manager_0.12' into 'master'

Browse Source 
Update `assets_manager` to 0.12

See merge request veloren/veloren!4566
This commit is contained in:
Marcel 2024-08-28 16:47:43 +00:00
commit 2c1a141fd8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -320,14 +320,15 @@ dependencies = [
[[package]] [[package]]
name = "assets_manager" name = "assets_manager"
version = "0.11.6" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4dde42f7d78f1a1d0149ac8526e21c6c849090ce6aa191ae94b90b0cb2e4aed" checksum = "eadb8d5c3ec796630a35133c038842b02bcfc2a8a324349fc24fd6db5d679474"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash 0.8.11", "ahash 0.8.11",
"bincode", "bincode",
"crossbeam-channel", "crossbeam-channel",
"hashbrown 0.14.5",
"log", "log",
"notify", "notify",
"ron", "ron",

2
common/assets/Cargo.toml
View File

@ -7,7 +7,7 @@ version = "0.10.0"
[dependencies] [dependencies]
lazy_static = { workspace = true } lazy_static = { workspace = true }
assets_manager = { version = "0.11.1", features = ["bincode", "ron", "json"] } assets_manager = { version = "0.12", features = ["bincode", "ron", "json"] }
ron = { workspace = true } ron = { workspace = true }
dot_vox = "5.1" dot_vox = "5.1"
wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them

2
voxygen/Cargo.toml
View File

@ -112,7 +112,7 @@ server = { package = "veloren-server", path = "../server", optional = true, defa
clap = { workspace = true } clap = { workspace = true }
# Utility # Utility
assets_manager = { version = "0.11", features = ["ab_glyph"] } assets_manager = { version = "0.12", features = ["ab_glyph"] }
backtrace = "0.3.40" backtrace = "0.3.40"
chrono = { workspace = true } chrono = { workspace = true }
chumsky = "0.9" chumsky = "0.9"