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

put ron behind a cargo feature as its only used in a bin and fix a logical merge conflict, overwriting with edfe713076

Browse Source
This commit is contained in:
Marcel Märtens 2021-06-07 10:51:38 +02:00
parent 670845e6f5
commit b1c2a1bde0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
no-assets = []
tracy = ["common-base/tracy"]
simd = ["vek/platform_intrinsics"]
bin_csv = ["csv", "structopt"]
bin_csv = ["ron", "csv", "structopt"]
default = ["simd"]
@ -19,7 +19,6 @@ common-base = { package = "veloren-common-base", path = "base" }
# Serde
serde = { version = "1.0.110", features = ["derive", "rc"] }
ron = { version = "0.6", default-features = false }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
approx = "0.4.0"
@ -47,6 +46,8 @@ dot_vox = "4.0"
# Assets
serde_repr = "0.1.6"
# csv import
ron = { version = "0.6", default-features = false, optional = true }
# csv export
csv = { version = "1.1.3", optional = true }
structopt = { version = "0.3.13", optional = true }

3
common/src/comp/body.rs
View File

@ -365,10 +365,9 @@ impl Body {
quadruped_low::Species::Monitor => Vec3::new(1.0, 2.3, 1.5),
quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.0, 1.3),
quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 1.6, 2.9),
quadruped_low::Species::Basilisk => Vec3::new(1.0, 1.6, 2.9),
quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9),
quadruped_low::Species::Salamander => Vec3::new(1.0, 2.4, 1.3),
quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.6, 2.0),
quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9),
_ => Vec3::new(1.0, 1.6, 1.3),
},
Body::Ship(ship) => ship.dimensions(),