mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'pfau/fix_orcs-add_inline_tweak' into 'master'
Orcs adjustment and inline_tweak crate See merge request veloren/veloren!1348
This commit is contained in:
Monty Marz
commit
8c3a448db5
11
Cargo.lock
generated
11
Cargo.lock
generated
@ -2126,6 +2126,15 @@ dependencies = [
|
||||
"autocfg 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inline_tweak"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16ef446327cf694068a2973e5a9ff7bb6ea03d9e7b090c9ef7cbc4b685f38ec"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify"
|
||||
version = "0.8.3"
|
||||
@ -4813,6 +4822,7 @@ dependencies = [
|
||||
"guillotiere",
|
||||
"hashbrown",
|
||||
"image",
|
||||
"inline_tweak",
|
||||
"itertools",
|
||||
"msgbox",
|
||||
"num 0.2.1",
|
||||
@ -4845,6 +4855,7 @@ name = "veloren-voxygen-anim"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"find_folder",
|
||||
"inline_tweak",
|
||||
"lazy_static",
|
||||
"libloading 0.6.2",
|
||||
"notify",
|
||||
|
||||
@ -1,84 +1,85 @@
|
||||
[package]
|
||||
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
|
||||
default-run = "veloren-voxygen"
|
||||
edition = "2018"
|
||||
name = "veloren-voxygen"
|
||||
version = "0.7.0"
|
||||
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
|
||||
edition = "2018"
|
||||
default-run = "veloren-voxygen"
|
||||
# Cargo thinks it should build the voxygen binary even when a specific bench is specified for building
|
||||
# Uncomment below and comment out default-run if you want to avoid this
|
||||
# autobins = false
|
||||
|
||||
[features]
|
||||
gl = ["gfx_device_gl", "gfx_gl"]
|
||||
hot-anim = ["anim/use-dyn-lib"]
|
||||
singleplayer = ["server"]
|
||||
tweak = ["const-tweaker"]
|
||||
hot-anim = ["anim/use-dyn-lib"]
|
||||
|
||||
default = ["gl", "singleplayer", "msgbox"]
|
||||
|
||||
[dependencies]
|
||||
common = { package = "veloren-common", path = "../common" }
|
||||
client = { package = "veloren-client", path = "../client" }
|
||||
client = {package = "veloren-client", path = "../client"}
|
||||
common = {package = "veloren-common", path = "../common"}
|
||||
|
||||
anim = { package = "veloren-voxygen-anim", path = "src/anim", default-features = false }
|
||||
anim = {package = "veloren-voxygen-anim", path = "src/anim", default-features = false}
|
||||
|
||||
# Graphics
|
||||
conrod_core = {git = "https://gitlab.com/veloren/conrod.git"}
|
||||
conrod_winit = {git = "https://gitlab.com/veloren/conrod.git"}
|
||||
euc = {git = "https://github.com/zesterer/euc.git"}
|
||||
gfx = "0.18.2"
|
||||
gfx_device_gl = { version = "0.16.2", optional = true }
|
||||
gfx_gl = { version = "0.6.1", optional = true }
|
||||
old_school_gfx_glutin_ext = "0.24"
|
||||
gfx_device_gl = {version = "0.16.2", optional = true}
|
||||
gfx_gl = {version = "0.6.1", optional = true}
|
||||
glutin = "0.24.1"
|
||||
winit = { version = "0.22.2", features = ["serde"] }
|
||||
conrod_core = { git = "https://gitlab.com/veloren/conrod.git" }
|
||||
conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
|
||||
euc = { git = "https://github.com/zesterer/euc.git" }
|
||||
old_school_gfx_glutin_ext = "0.24"
|
||||
winit = {version = "0.22.2", features = ["serde"]}
|
||||
|
||||
# ECS
|
||||
specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
|
||||
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-git" }
|
||||
specs = {git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5"}
|
||||
specs-idvs = {git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-git"}
|
||||
|
||||
# Mathematics
|
||||
vek = { version = "0.12.0", features = ["platform_intrinsics", "serde"] }
|
||||
vek = {version = "0.12.0", features = ["platform_intrinsics", "serde"]}
|
||||
|
||||
# Controller
|
||||
gilrs = { version = "0.7", features = ["serde"] }
|
||||
gilrs = {version = "0.7", features = ["serde"]}
|
||||
|
||||
# Singleplayer
|
||||
server = { package = "veloren-server", path = "../server", optional = true }
|
||||
server = {package = "veloren-server", path = "../server", optional = true}
|
||||
|
||||
# Utility
|
||||
glsl-include = "0.3.1"
|
||||
failure = "0.1.6"
|
||||
dot_vox = "4.0"
|
||||
enum-iterator = "0.6"
|
||||
image = { version = "0.23.8", default-features = false, features = ["ico", "png"] }
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
ron = { version = "0.6", default-features = false }
|
||||
guillotiere = "0.5.2"
|
||||
msgbox = { git = "https://github.com/bekker/msgbox-rs.git", default-features = false, rev = "68fe39a", optional = true }
|
||||
directories-next = "1.0.1"
|
||||
num = "0.2"
|
||||
backtrace = "0.3.40"
|
||||
rand = "0.7"
|
||||
treeculler = "0.1.0"
|
||||
rodio = { version = "0.11", default-features = false, features = ["wav", "vorbis"] }
|
||||
bincode = "1.2"
|
||||
chrono = "0.4.9"
|
||||
cpal = "0.11"
|
||||
crossbeam = "=0.7.2"
|
||||
hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] }
|
||||
chrono = "0.4.9"
|
||||
bincode = "1.2"
|
||||
deunicode = "1.0"
|
||||
directories-next = "1.0.1"
|
||||
dot_vox = "4.0"
|
||||
enum-iterator = "0.6"
|
||||
failure = "0.1.6"
|
||||
glsl-include = "0.3.1"
|
||||
guillotiere = "0.5.2"
|
||||
hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]}
|
||||
image = {version = "0.23.8", default-features = false, features = ["ico", "png"]}
|
||||
msgbox = {git = "https://github.com/bekker/msgbox-rs.git", default-features = false, rev = "68fe39a", optional = true}
|
||||
num = "0.2"
|
||||
rand = "0.7"
|
||||
rodio = {version = "0.11", default-features = false, features = ["wav", "vorbis"]}
|
||||
ron = {version = "0.6", default-features = false}
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
treeculler = "0.1.0"
|
||||
uvth = "3.1.1"
|
||||
# vec_map = { version = "0.8.2" }
|
||||
const-tweaker = { version = "0.3.1", optional = true }
|
||||
const-tweaker = {version = "0.3.1", optional = true}
|
||||
inline_tweak = "1.0.2"
|
||||
itertools = "0.9.0"
|
||||
|
||||
# Logging
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec" , "tracing-log"] }
|
||||
tracing-log = "0.1.1"
|
||||
tracing-appender = "0.1"
|
||||
tracing-log = "0.1.1"
|
||||
tracing-subscriber = {version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec", "tracing-log"]}
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
dispatch = "0.1.4"
|
||||
@ -89,8 +90,8 @@ winres = "0.1"
|
||||
[dev-dependencies]
|
||||
criterion = "0.3"
|
||||
git2 = "0.13"
|
||||
world = { package = "veloren-world", path = "../world" }
|
||||
world = {package = "veloren-world", path = "../world"}
|
||||
|
||||
[[bench]]
|
||||
name = "meshing_benchmark"
|
||||
harness = false
|
||||
name = "meshing_benchmark"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
[package]
|
||||
name = "veloren-voxygen-anim"
|
||||
version = "0.7.0"
|
||||
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
|
||||
edition = "2018"
|
||||
name = "veloren-voxygen-anim"
|
||||
version = "0.7.0"
|
||||
|
||||
[lib]
|
||||
name = "voxygen_anim"
|
||||
@ -11,16 +11,17 @@ name = "voxygen_anim"
|
||||
# crate-type = ["lib", "cdylib"]
|
||||
|
||||
[features]
|
||||
use-dyn-lib = ["libloading", "notify", "lazy_static", "tracing", "find_folder"]
|
||||
be-dyn-lib = []
|
||||
use-dyn-lib = ["libloading", "notify", "lazy_static", "tracing", "find_folder"]
|
||||
|
||||
default = ["be-dyn-lib"]
|
||||
|
||||
[dependencies]
|
||||
vek = { version = "0.12.0", features = ["platform_intrinsics", "serde"] }
|
||||
common = { package = "veloren-common", path = "../../../common" }
|
||||
libloading = { version = "0.6.2", optional = true }
|
||||
notify = { version = "5.0.0-pre.2", optional = true }
|
||||
lazy_static = { version = "1.4.0", optional = true }
|
||||
tracing = { version = "0.1", optional = true }
|
||||
find_folder = { version = "0.3.0", optional = true}
|
||||
common = {package = "veloren-common", path = "../../../common"}
|
||||
find_folder = {version = "0.3.0", optional = true}
|
||||
inline_tweak = "1.0.2"
|
||||
lazy_static = {version = "1.4.0", optional = true}
|
||||
libloading = {version = "0.6.2", optional = true}
|
||||
notify = {version = "5.0.0-pre.2", optional = true}
|
||||
tracing = {version = "0.1", optional = true}
|
||||
vek = {version = "0.12.0", features = ["platform_intrinsics", "serde"]}
|
||||
|
||||
@ -186,7 +186,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
|
||||
scaler: SkeletonAttr::calculate_scale(body),
|
||||
head_scale: match (body.species, body.body_type) {
|
||||
(Orc, Male) => 0.9,
|
||||
(Orc, Female) => 1.0,
|
||||
(Orc, Female) => 0.9,
|
||||
(Human, Male) => 0.9,
|
||||
(Human, Female) => 0.9,
|
||||
(Elf, Male) => 0.9,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user