mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
This commit is contained in:
Joshua Yanovski
commit
db1401a691
@ -1,4 +1,5 @@
|
|||||||
[target.x86_64-unknown-linux-gnu]
|
[target.x86_64-unknown-linux-gnu]
|
||||||
rustflags = [
|
rustflags = [
|
||||||
"-C", "link-arg=-fuse-ld=gold",
|
"-C", "link-arg=-fuse-ld=gold",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
16
CHANGELOG.md
16
CHANGELOG.md
@ -34,6 +34,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Ability to wield 2 × 1h weapons and shields (Note: 1h weapons & shields are not currently avaliable, see [!1095](https://gitlab.com/veloren/veloren/-/merge_requests/1095) for more info)
|
- Ability to wield 2 × 1h weapons and shields (Note: 1h weapons & shields are not currently avaliable, see [!1095](https://gitlab.com/veloren/veloren/-/merge_requests/1095) for more info)
|
||||||
- Zoomable Map
|
- Zoomable Map
|
||||||
- M2 attack for hammer
|
- M2 attack for hammer
|
||||||
|
- Spawnable training dummies
|
||||||
|
- New quadruped_low body for reptile-likes
|
||||||
|
- Added new animals
|
||||||
|
- Better pathfinding
|
||||||
|
- Bombs
|
||||||
|
- Training dummy items
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@ -50,6 +56,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Fixed unable to use ability; Secondary and ability3 (fire rod) will now automatically wield
|
- Fixed unable to use ability; Secondary and ability3 (fire rod) will now automatically wield
|
||||||
- Gliding is now a toggle that can be triggered from the ground
|
- Gliding is now a toggle that can be triggered from the ground
|
||||||
- Replaced `log` with `tracing` in all crates
|
- Replaced `log` with `tracing` in all crates
|
||||||
|
- Switch to a new network backend that will allow several improvements in the future
|
||||||
|
- Connection screen fails after 4 minutes if it can't connect to the server instead of 80 minutes
|
||||||
|
- Rebuilt quadruped_medium animation and assets
|
||||||
|
- Disabled destruction of most blocks by explosions
|
||||||
|
- Disable damage to pets
|
||||||
|
- Made pets healable
|
||||||
|
- Rebalanced fire staff
|
||||||
|
- Animals are more effective in combat
|
||||||
|
- Pathfinding is much smoother and pets are cleverer
|
||||||
|
- Animals run/turn at different speeds
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
|
|||||||
359
Cargo.lock
generated
359
Cargo.lock
generated
@ -15,15 +15,6 @@ version = "1.0.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
|
checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ahash"
|
|
||||||
version = "0.2.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
|
|
||||||
dependencies = [
|
|
||||||
"const-random",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ahash"
|
name = "ahash"
|
||||||
version = "0.3.8"
|
version = "0.3.8"
|
||||||
@ -81,12 +72,6 @@ dependencies = [
|
|||||||
"winapi 0.3.8",
|
"winapi 0.3.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "anyhow"
|
|
||||||
version = "1.0.31"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anymap"
|
name = "anymap"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@ -120,7 +105,7 @@ checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-hack",
|
"proc-macro-hack",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -163,7 +148,7 @@ dependencies = [
|
|||||||
"crossbeam-utils 0.7.2",
|
"crossbeam-utils 0.7.2",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-io",
|
"futures-io",
|
||||||
"futures-timer 2.0.2",
|
"futures-timer",
|
||||||
"kv-log-macro",
|
"kv-log-macro",
|
||||||
"log",
|
"log",
|
||||||
"memchr",
|
"memchr",
|
||||||
@ -474,16 +459,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "chashmap"
|
|
||||||
version = "2.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45"
|
|
||||||
dependencies = [
|
|
||||||
"owning_ref",
|
|
||||||
"parking_lot 0.4.8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.11"
|
version = "0.4.11"
|
||||||
@ -623,13 +598,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "const-tweaker"
|
name = "const-tweaker"
|
||||||
version = "0.2.6"
|
version = "0.3.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7fbe3e1d2fccd896d451adb486910a0bfc233fd6dcafdb4e13bac7de72f8f250"
|
checksum = "297be2ecc39b6e680c7bb03d8d053a483c32a61d95bd758fca76e9b95ce7e276"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
|
||||||
"async-std",
|
"async-std",
|
||||||
"const-tweaker-attribute",
|
"const-tweaker-attribute",
|
||||||
|
"ctor",
|
||||||
"dashmap",
|
"dashmap",
|
||||||
"horrorshow",
|
"horrorshow",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
@ -639,14 +614,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "const-tweaker-attribute"
|
name = "const-tweaker-attribute"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1a43d28ffebd3bb949c8c274de94fb84826134a023c5e6dac528c38a0f1cf1ba"
|
checksum = "2d709e38f0f6100c0c8c0b3aefb0aa1f83af865d7b6b267e8402820513a0c0d8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -729,18 +704,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cpal"
|
name = "cpal"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120"
|
checksum = "6b55d55d69f403f62a95bd3c04b431e0aedf5120c70f15d07a8edd234443dd59"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"alsa-sys",
|
"alsa-sys",
|
||||||
"core-foundation-sys",
|
"core-foundation-sys",
|
||||||
"coreaudio-rs",
|
"coreaudio-rs",
|
||||||
"failure",
|
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libc",
|
"libc",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"stdweb 0.1.3",
|
"stdweb 0.1.3",
|
||||||
|
"thiserror",
|
||||||
"winapi 0.3.8",
|
"winapi 0.3.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -764,7 +739,7 @@ dependencies = [
|
|||||||
"clap",
|
"clap",
|
||||||
"criterion-plot",
|
"criterion-plot",
|
||||||
"csv",
|
"csv",
|
||||||
"itertools 0.9.0",
|
"itertools",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"oorandom",
|
"oorandom",
|
||||||
@ -785,7 +760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "ddeaf7989f00f2e1d871a26a110f3ed713632feac17f65f03ca938c542618b60"
|
checksum = "ddeaf7989f00f2e1d871a26a110f3ed713632feac17f65f03ca938c542618b60"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cast",
|
"cast",
|
||||||
"itertools 0.9.0",
|
"itertools",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -924,6 +899,16 @@ dependencies = [
|
|||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ctor"
|
||||||
|
version = "0.1.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227"
|
||||||
|
dependencies = [
|
||||||
|
"quote 1.0.7",
|
||||||
|
"syn 1.0.33",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "daggy"
|
name = "daggy"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@ -954,7 +939,7 @@ dependencies = [
|
|||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"strsim",
|
"strsim",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -965,7 +950,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"darling_core",
|
"darling_core",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -974,7 +959,7 @@ version = "3.11.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8cfcd41ae02d60edded204341d2798ba519c336c51a37330aa4b98a1128def32"
|
checksum = "8cfcd41ae02d60edded204341d2798ba519c336c51a37330aa4b98a1128def32"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.3.8",
|
"ahash",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
]
|
]
|
||||||
@ -995,17 +980,6 @@ dependencies = [
|
|||||||
"byteorder 1.3.4",
|
"byteorder 1.3.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "derivative"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3c6d883546668a3e2011b6a716a7330b82eabb0151b138217f632c8243e17135"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2 0.4.30",
|
|
||||||
"quote 0.6.13",
|
|
||||||
"syn 0.15.44",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deunicode"
|
name = "deunicode"
|
||||||
version = "1.1.1"
|
version = "1.1.1"
|
||||||
@ -1031,7 +1005,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1045,20 +1019,20 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "directories"
|
name = "directories-next"
|
||||||
version = "2.0.2"
|
version = "1.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
|
checksum = "21eaa04e945bec7e2dc7383817c566881d9a83d20a07cc949b54585873585a48"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"dirs-sys",
|
"dirs-sys-next",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs-sys"
|
name = "dirs-sys-next"
|
||||||
version = "0.3.5"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
|
checksum = "9c60f7b8a8953926148223260454befb50c751d3c50e1c178c4fd1ace4083c9a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
@ -1183,7 +1157,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
"synstructure",
|
"synstructure",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -1347,7 +1321,7 @@ dependencies = [
|
|||||||
"proc-macro-hack",
|
"proc-macro-hack",
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1371,12 +1345,6 @@ version = "2.0.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6"
|
checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "futures-timer"
|
|
||||||
version = "3.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-util"
|
name = "futures-util"
|
||||||
version = "0.3.5"
|
version = "0.3.5"
|
||||||
@ -1607,9 +1575,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "git2"
|
name = "git2"
|
||||||
version = "0.10.2"
|
version = "0.13.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
|
checksum = "11e4b2082980e751c4bf4273e9cbb4a02c655729c8ee8a79f66cad03c8f4d31e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"libc",
|
"libc",
|
||||||
@ -1848,12 +1816,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
version = "0.6.3"
|
version = "0.7.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
|
checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.2.18",
|
"ahash",
|
||||||
"autocfg 0.1.7",
|
"autocfg 1.0.0",
|
||||||
"rayon",
|
"rayon",
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
@ -2092,15 +2060,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "itertools"
|
|
||||||
version = "0.8.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
|
|
||||||
dependencies = [
|
|
||||||
"either",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -2173,13 +2132,13 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lewton"
|
name = "lewton"
|
||||||
version = "0.9.4"
|
version = "0.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
|
checksum = "be42bea7971f4ba0ea1e215730c29bc1ff9bd2a9c10013912f42a8dcf8d77c0d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder 1.3.4",
|
"byteorder 1.3.4",
|
||||||
"ogg",
|
"ogg",
|
||||||
"smallvec 0.6.13",
|
"tinyvec",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2190,9 +2149,9 @@ checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libgit2-sys"
|
name = "libgit2-sys"
|
||||||
version = "0.9.2"
|
version = "0.12.7+1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
|
checksum = "bcd07968649bcb7b9351ecfde53ca4d27673cccfdf57c84255ec18710f3153e0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
@ -2223,9 +2182,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libsqlite3-sys"
|
name = "libsqlite3-sys"
|
||||||
version = "0.9.3"
|
version = "0.18.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d3711dfd91a1081d2458ad2d06ea30a8755256e74038be2ad927d94e1c955ca8"
|
checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
@ -2393,7 +2352,7 @@ dependencies = [
|
|||||||
"migrations_internals",
|
"migrations_internals",
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2562,13 +2521,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "notify"
|
name = "notify"
|
||||||
version = "5.0.0-pre.2"
|
version = "5.0.0-pre.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7b00c0b65188bffb5598c302e19b062feb94adef02c31f15622a163c95d673c3"
|
checksum = "77d03607cf88b4b160ba0e9ed425fff3cee3b55ac813f0c685b3a3772da37d0e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anymap",
|
"anymap",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"chashmap",
|
|
||||||
"crossbeam-channel 0.4.2",
|
"crossbeam-channel 0.4.2",
|
||||||
"filetime",
|
"filetime",
|
||||||
"fsevent",
|
"fsevent",
|
||||||
@ -2629,9 +2587,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-integer"
|
name = "num-integer"
|
||||||
version = "0.1.42"
|
version = "0.1.43"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
|
checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg 1.0.0",
|
"autocfg 1.0.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
@ -2639,9 +2597,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-iter"
|
name = "num-iter"
|
||||||
version = "0.1.40"
|
version = "0.1.41"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
|
checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg 1.0.0",
|
"autocfg 1.0.0",
|
||||||
"num-integer",
|
"num-integer",
|
||||||
@ -2662,9 +2620,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.11"
|
version = "0.2.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
|
checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg 1.0.0",
|
"autocfg 1.0.0",
|
||||||
]
|
]
|
||||||
@ -2782,15 +2740,6 @@ dependencies = [
|
|||||||
"shared_library",
|
"shared_library",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "owning_ref"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
|
|
||||||
dependencies = [
|
|
||||||
"stable_deref_trait",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "packed_simd"
|
name = "packed_simd"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
@ -2827,16 +2776,6 @@ dependencies = [
|
|||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot"
|
|
||||||
version = "0.4.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
|
|
||||||
dependencies = [
|
|
||||||
"owning_ref",
|
|
||||||
"parking_lot_core 0.2.14",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot"
|
name = "parking_lot"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -2858,18 +2797,6 @@ dependencies = [
|
|||||||
"parking_lot_core 0.7.2",
|
"parking_lot_core 0.7.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot_core"
|
|
||||||
version = "0.2.14"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"rand 0.4.6",
|
|
||||||
"smallvec 0.6.13",
|
|
||||||
"winapi 0.3.8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot_core"
|
name = "parking_lot_core"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
@ -2943,7 +2870,7 @@ checksum = "10b4b44893d3c370407a1d6a5cfde7c41ae0478e31c516c85f67eb3adc51be6d"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3052,15 +2979,6 @@ version = "0.1.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de"
|
checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro2"
|
|
||||||
version = "0.3.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-xid 0.1.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "0.4.30"
|
version = "0.4.30"
|
||||||
@ -3081,27 +2999,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prometheus"
|
name = "prometheus"
|
||||||
version = "0.7.0"
|
version = "0.9.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
|
checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"fnv",
|
"fnv",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"quick-error",
|
|
||||||
"spin",
|
"spin",
|
||||||
]
|
"thiserror",
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prometheus-static-metric"
|
|
||||||
version = "0.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1baa57413523cff73783204f73299a3f602ebcf51a5e64752b32bc1b3c376013"
|
|
||||||
dependencies = [
|
|
||||||
"lazy_static",
|
|
||||||
"proc-macro2 0.3.8",
|
|
||||||
"quote 0.5.2",
|
|
||||||
"syn 0.13.11",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3119,15 +3025,6 @@ version = "1.2.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "quote"
|
|
||||||
version = "0.5.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2 0.3.8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "0.6.13"
|
version = "0.6.13"
|
||||||
@ -3152,19 +3049,6 @@ version = "0.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
|
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rand"
|
|
||||||
version = "0.4.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
|
|
||||||
dependencies = [
|
|
||||||
"fuchsia-cprng",
|
|
||||||
"libc",
|
|
||||||
"rand_core 0.3.1",
|
|
||||||
"rdrand",
|
|
||||||
"winapi 0.3.8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.5.6"
|
version = "0.5.6"
|
||||||
@ -3439,9 +3323,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rodio"
|
name = "rodio"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
|
checksum = "73bbf260262fd5501b7a17d6827e0d25c1127e921eb177150a060faf6e217a70"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cpal",
|
"cpal",
|
||||||
"hound",
|
"hound",
|
||||||
@ -3646,22 +3530,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.111"
|
version = "1.0.114"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
|
checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.111"
|
version = "1.0.114"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
|
checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3720,16 +3604,17 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shred"
|
name = "shred"
|
||||||
version = "0.9.4"
|
version = "0.10.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
|
checksum = "c5f08237e667ac94ad20f8878b5943d91a93ccb231428446c57c21c57779016d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec 0.4.12",
|
"arrayvec 0.5.1",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"mopa",
|
"mopa",
|
||||||
"rayon",
|
"rayon",
|
||||||
"shred-derive",
|
"shred-derive",
|
||||||
"smallvec 0.6.13",
|
"smallvec 1.4.0",
|
||||||
|
"tynm",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3740,7 +3625,7 @@ checksum = "a1f37080f2751fbf091dbdebaa95bd6cf9dbf74ad1d50396b1908518a1747fdf"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3815,12 +3700,10 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "specs"
|
name = "specs"
|
||||||
version = "0.15.1"
|
version = "0.16.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/amethyst/specs.git?rev=7a2e348ab2223818bad487695c66c43db88050a5#7a2e348ab2223818bad487695c66c43db88050a5"
|
||||||
checksum = "4943fde8c5d3d14c3d19d2a4c7abbd7b626c270a19e6cd35252294a48feb698c"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-queue 0.1.2",
|
"crossbeam-queue 0.2.3",
|
||||||
"derivative",
|
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"hibitset",
|
"hibitset",
|
||||||
"log",
|
"log",
|
||||||
@ -3834,7 +3717,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "specs-idvs"
|
name = "specs-idvs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://gitlab.com/veloren/specs-idvs.git#111548cf44e9bb4c43feb12aa3fc253953ac6e4a"
|
source = "git+https://gitlab.com/veloren/specs-idvs.git#530ebb00b60685d6d1f47a3bc16c5b1f25c5e530"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"specs",
|
"specs",
|
||||||
]
|
]
|
||||||
@ -3845,12 +3728,6 @@ version = "0.5.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "stable_deref_trait"
|
|
||||||
version = "1.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "static_assertions"
|
name = "static_assertions"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@ -3898,7 +3775,7 @@ dependencies = [
|
|||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3914,7 +3791,7 @@ dependencies = [
|
|||||||
"serde_derive",
|
"serde_derive",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha1",
|
"sha1",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3950,17 +3827,6 @@ version = "0.4.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
|
checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn"
|
|
||||||
version = "0.13.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2 0.3.8",
|
|
||||||
"quote 0.5.2",
|
|
||||||
"unicode-xid 0.1.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "0.15.44"
|
version = "0.15.44"
|
||||||
@ -3974,9 +3840,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.31"
|
version = "1.0.33"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
|
checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
@ -3991,7 +3857,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
"unicode-xid 0.2.0",
|
"unicode-xid 0.2.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -4013,6 +3879,26 @@ dependencies = [
|
|||||||
"unicode-width",
|
"unicode-width",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror"
|
||||||
|
version = "1.0.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
|
||||||
|
dependencies = [
|
||||||
|
"thiserror-impl",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror-impl"
|
||||||
|
version = "1.0.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2 1.0.18",
|
||||||
|
"quote 1.0.7",
|
||||||
|
"syn 1.0.33",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thread_local"
|
name = "thread_local"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@ -4076,6 +3962,12 @@ dependencies = [
|
|||||||
"serde_json",
|
"serde_json",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tinyvec"
|
||||||
|
version = "0.3.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "0.1.22"
|
version = "0.1.22"
|
||||||
@ -4247,7 +4139,7 @@ checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -4331,6 +4223,15 @@ version = "0.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
|
checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tynm"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "367fb781963961b4a90a3362c54b1871caaecb081f011005778242230f39d34e"
|
||||||
|
dependencies = [
|
||||||
|
"nom 5.1.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-bidi"
|
name = "unicode-bidi"
|
||||||
version = "0.3.4"
|
version = "0.3.4"
|
||||||
@ -4486,7 +4387,7 @@ dependencies = [
|
|||||||
"authc",
|
"authc",
|
||||||
"byteorder 1.3.4",
|
"byteorder 1.3.4",
|
||||||
"futures-executor",
|
"futures-executor",
|
||||||
"futures-timer 3.0.2",
|
"futures-timer",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"image",
|
"image",
|
||||||
@ -4507,7 +4408,6 @@ name = "veloren-common"
|
|||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"authc",
|
"authc",
|
||||||
"bincode",
|
|
||||||
"criterion",
|
"criterion",
|
||||||
"crossbeam",
|
"crossbeam",
|
||||||
"dot_vox",
|
"dot_vox",
|
||||||
@ -4516,15 +4416,12 @@ dependencies = [
|
|||||||
"image",
|
"image",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"lz4-compress",
|
|
||||||
"mio",
|
|
||||||
"notify",
|
"notify",
|
||||||
"parking_lot 0.9.0",
|
"parking_lot 0.9.0",
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"rayon",
|
"rayon",
|
||||||
"ron",
|
"ron",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"specs",
|
"specs",
|
||||||
"specs-idvs",
|
"specs-idvs",
|
||||||
@ -4544,19 +4441,17 @@ dependencies = [
|
|||||||
"diesel_migrations",
|
"diesel_migrations",
|
||||||
"dotenv",
|
"dotenv",
|
||||||
"futures-executor",
|
"futures-executor",
|
||||||
"futures-timer 3.0.2",
|
"futures-timer",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libsqlite3-sys",
|
"libsqlite3-sys",
|
||||||
"portpicker",
|
"portpicker",
|
||||||
"prometheus",
|
"prometheus",
|
||||||
"prometheus-static-metric",
|
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"ron",
|
"ron",
|
||||||
"scan_fmt",
|
"scan_fmt",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"specs",
|
"specs",
|
||||||
"specs-idvs",
|
"specs-idvs",
|
||||||
@ -4594,7 +4489,7 @@ dependencies = [
|
|||||||
"criterion",
|
"criterion",
|
||||||
"crossbeam",
|
"crossbeam",
|
||||||
"deunicode",
|
"deunicode",
|
||||||
"directories",
|
"directories-next",
|
||||||
"dispatch",
|
"dispatch",
|
||||||
"dot_vox",
|
"dot_vox",
|
||||||
"euc",
|
"euc",
|
||||||
@ -4659,7 +4554,7 @@ dependencies = [
|
|||||||
"fxhash",
|
"fxhash",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"image",
|
"image",
|
||||||
"itertools 0.8.2",
|
"itertools",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"minifb",
|
"minifb",
|
||||||
"noise",
|
"noise",
|
||||||
@ -4673,7 +4568,6 @@ dependencies = [
|
|||||||
"ron",
|
"ron",
|
||||||
"roots",
|
"roots",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"vek",
|
"vek",
|
||||||
@ -4689,6 +4583,7 @@ dependencies = [
|
|||||||
"crossbeam-channel 0.4.2",
|
"crossbeam-channel 0.4.2",
|
||||||
"futures 0.3.5",
|
"futures 0.3.5",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"lz4-compress",
|
||||||
"prometheus",
|
"prometheus",
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"serde",
|
"serde",
|
||||||
@ -4765,7 +4660,7 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -4787,7 +4682,7 @@ checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.18",
|
"proc-macro2 1.0.18",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.31",
|
"syn 1.0.33",
|
||||||
"wasm-bindgen-backend",
|
"wasm-bindgen-backend",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -72,3 +72,7 @@ debug = false
|
|||||||
[profile.releasedebuginfo]
|
[profile.releasedebuginfo]
|
||||||
inherits = 'release'
|
inherits = 'release'
|
||||||
debug = 1
|
debug = 1
|
||||||
|
|
||||||
|
# living on the edge
|
||||||
|
[patch.crates-io]
|
||||||
|
specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
|
||||||
|
|||||||
@ -38,7 +38,7 @@ We provide 64-bit builds for Linux, Mac, and Windows, which can be downloaded on
|
|||||||
|
|
||||||
Due to rapid developement stable versions become outdated fast and might be **incompatible with the public server**.
|
Due to rapid developement stable versions become outdated fast and might be **incompatible with the public server**.
|
||||||
|
|
||||||
If you want to compile Veloren yourself, take a look at the [How to Compile Guide](https://book.veloren.net/compile/index.html) in the book.
|
If you want to compile Veloren yourself, follow the instructions in our [Book](https://book.veloren.net/contributors/introduction.html).
|
||||||
|
|
||||||
### Packaging status
|
### Packaging status
|
||||||
|
|
||||||
|
|||||||
7
assets/common/items/bomb.ron
Normal file
7
assets/common/items/bomb.ron
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
Item(
|
||||||
|
name: "Bomb",
|
||||||
|
description: "Boom!\n\n<Right-Click to use>",
|
||||||
|
kind: Throwable(
|
||||||
|
kind: Bomb,
|
||||||
|
),
|
||||||
|
)
|
||||||
8
assets/common/items/bomb_pile.ron
Normal file
8
assets/common/items/bomb_pile.ron
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
Item(
|
||||||
|
name: "Bomb",
|
||||||
|
description: "Boom!\n\n<Right-Click to use>",
|
||||||
|
kind: Throwable(
|
||||||
|
kind: Bomb,
|
||||||
|
amount: 10,
|
||||||
|
),
|
||||||
|
)
|
||||||
7
assets/common/items/training_dummy.ron
Normal file
7
assets/common/items/training_dummy.ron
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
Item(
|
||||||
|
name: "Training Dummy",
|
||||||
|
description: "His name is William. Fire at will.\n\n<Right-Click to use>",
|
||||||
|
kind: Throwable(
|
||||||
|
kind: TrainingDummy,
|
||||||
|
),
|
||||||
|
)
|
||||||
@ -1,10 +1,18 @@
|
|||||||
[
|
[
|
||||||
// All loot rates go here
|
// All loot rates go here
|
||||||
|
// food
|
||||||
|
(3, "common.items.cheese"),
|
||||||
|
(3, "common.items.apple"),
|
||||||
|
(3, "common.items.mushroom"),
|
||||||
// miscellaneous
|
// miscellaneous
|
||||||
(0.4, "common.items.velorite"),
|
(0.4, "common.items.velorite"),
|
||||||
(0.6, "common.items.veloritefrag"),
|
(0.6, "common.items.veloritefrag"),
|
||||||
|
(0.6, "common.items.cheese"),
|
||||||
|
(0.6, "common.items.apple"),
|
||||||
(1.5, "common.items.potion_minor"),
|
(1.5, "common.items.potion_minor"),
|
||||||
(1, "common.items.collar"),
|
(0.5, "common.items.collar"),
|
||||||
|
(0.5, "common.items.bomb_pile"),
|
||||||
|
(1, "common.items.bomb"),
|
||||||
// swords
|
// swords
|
||||||
(0.1, "common.items.weapons.sword.starter_sword"),
|
(0.1, "common.items.weapons.sword.starter_sword"),
|
||||||
(0.1, "common.items.weapons.sword.wood_sword"),
|
(0.1, "common.items.weapons.sword.wood_sword"),
|
||||||
@ -73,7 +81,6 @@
|
|||||||
(0.2, "common.items.armor.pants.cloth_blue_0"),
|
(0.2, "common.items.armor.pants.cloth_blue_0"),
|
||||||
(0.2, "common.items.armor.pants.cloth_green_0"),
|
(0.2, "common.items.armor.pants.cloth_green_0"),
|
||||||
(0.2, "common.items.armor.pants.cloth_purple_0"),
|
(0.2, "common.items.armor.pants.cloth_purple_0"),
|
||||||
(0.15, "common.items.armor.pants.green_0"),
|
|
||||||
(0.15, "common.items.armor.pants.leather_0"),
|
(0.15, "common.items.armor.pants.leather_0"),
|
||||||
(0.1, "common.items.armor.pants.steel_0"),
|
(0.1, "common.items.armor.pants.steel_0"),
|
||||||
(0.05, "common.items.armor.pants.plate_green_0"),
|
(0.05, "common.items.armor.pants.plate_green_0"),
|
||||||
|
|||||||
@ -251,22 +251,10 @@
|
|||||||
"keyword": "sabertooth",
|
"keyword": "sabertooth",
|
||||||
"generic": "Sabertooth Tiger"
|
"generic": "Sabertooth Tiger"
|
||||||
},
|
},
|
||||||
"viper": {
|
|
||||||
"keyword": "viper",
|
|
||||||
"generic": "Lizard"
|
|
||||||
},
|
|
||||||
"tuskram": {
|
"tuskram": {
|
||||||
"keyword": "tuskram",
|
"keyword": "tuskram",
|
||||||
"generic": "Tusk Ram"
|
"generic": "Tusk Ram"
|
||||||
},
|
},
|
||||||
"alligator": {
|
|
||||||
"keyword": "alligator",
|
|
||||||
"generic": "Alligator"
|
|
||||||
},
|
|
||||||
"monitor": {
|
|
||||||
"keyword": "monitor",
|
|
||||||
"generic": "Monitor Lizard"
|
|
||||||
},
|
|
||||||
"lion": {
|
"lion": {
|
||||||
"keyword": "lion",
|
"keyword": "lion",
|
||||||
"generic": "Lion"
|
"generic": "Lion"
|
||||||
@ -274,6 +262,22 @@
|
|||||||
"tarasque": {
|
"tarasque": {
|
||||||
"keyword": "tarasque",
|
"keyword": "tarasque",
|
||||||
"generic": "Tarasque"
|
"generic": "Tarasque"
|
||||||
|
},
|
||||||
|
"tiger": {
|
||||||
|
"keyword": "tiger",
|
||||||
|
"generic": "Tiger"
|
||||||
|
},
|
||||||
|
"wolf": {
|
||||||
|
"keyword": "wolf",
|
||||||
|
"generic": "Wolf"
|
||||||
|
},
|
||||||
|
"frostfang": {
|
||||||
|
"keyword": "frostfang",
|
||||||
|
"generic": "Frostfang"
|
||||||
|
},
|
||||||
|
"mouflon": {
|
||||||
|
"keyword": "mouflon",
|
||||||
|
"generic": "Mouflon"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -589,5 +593,47 @@
|
|||||||
"names": []
|
"names": []
|
||||||
},
|
},
|
||||||
"species": null
|
"species": null
|
||||||
|
},
|
||||||
|
"quadruped_low": {
|
||||||
|
"body": {
|
||||||
|
"keyword": "quadruped_low",
|
||||||
|
"names": [
|
||||||
|
"Sobek"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"species": {
|
||||||
|
"crocodile": {
|
||||||
|
"keyword": "crocodile",
|
||||||
|
"generic": "Crocodile"
|
||||||
|
},
|
||||||
|
"alligator": {
|
||||||
|
"keyword": "alligator",
|
||||||
|
"generic": "Alligator"
|
||||||
|
},
|
||||||
|
"salamander": {
|
||||||
|
"keyword": "salamander",
|
||||||
|
"generic": "Salamander"
|
||||||
|
},
|
||||||
|
"monitor": {
|
||||||
|
"keyword": "monitor",
|
||||||
|
"generic": "Monitor"
|
||||||
|
},
|
||||||
|
"asp": {
|
||||||
|
"keyword": "asp",
|
||||||
|
"generic": "Asp"
|
||||||
|
},
|
||||||
|
"tortoise": {
|
||||||
|
"keyword": "tortoise",
|
||||||
|
"generic": "Tortoise"
|
||||||
|
},
|
||||||
|
"rocksnapper": {
|
||||||
|
"keyword": "rocksnapper",
|
||||||
|
"generic": "Rock Snapper"
|
||||||
|
},
|
||||||
|
"pangolin": {
|
||||||
|
"keyword": "pangolin",
|
||||||
|
"generic": "Pangolin"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -156,8 +156,8 @@ https://account.veloren.net."#,
|
|||||||
"hud.press_key_to_toggle_debug_info_fmt": "Press {key} to toggle debug info",
|
"hud.press_key_to_toggle_debug_info_fmt": "Press {key} to toggle debug info",
|
||||||
|
|
||||||
// Chat outputs
|
// Chat outputs
|
||||||
"hud.chat.online_msg": "[{name}] is now online.",
|
"hud.chat.online_msg": "[{name}] is now online.",
|
||||||
"hud.chat.offline_msg": "{name} went offline.",
|
"hud.chat.offline_msg": "{name} went offline.",
|
||||||
"hud.chat.loot_msg": "You picked up [{item}]",
|
"hud.chat.loot_msg": "You picked up [{item}]",
|
||||||
"hud.chat.loot_fail": "Your Inventory is full!",
|
"hud.chat.loot_fail": "Your Inventory is full!",
|
||||||
"hud.chat.goodbye": "Goodbye!",
|
"hud.chat.goodbye": "Goodbye!",
|
||||||
@ -204,15 +204,15 @@ Want to free your cursor to close this window? Press TAB!
|
|||||||
Enjoy your stay in the World of Veloren."#,
|
Enjoy your stay in the World of Veloren."#,
|
||||||
|
|
||||||
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
|
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
|
||||||
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
|
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
|
||||||
have emerged all around our peaceful towns!
|
have emerged all around our peaceful towns!
|
||||||
|
|
||||||
|
|
||||||
Gather some company, stack up on food
|
Gather some company, stack up on food
|
||||||
and defeat their vile leaders and acolytes.
|
and defeat their vile leaders and acolytes.
|
||||||
|
|
||||||
|
|
||||||
Maybe you can even obtain one of their
|
Maybe you can even obtain one of their
|
||||||
magically infused items?"#,
|
magically infused items?"#,
|
||||||
|
|
||||||
|
|
||||||
@ -236,7 +236,7 @@ magically infused items?"#,
|
|||||||
"hud.bag.legs": "Legs",
|
"hud.bag.legs": "Legs",
|
||||||
"hud.bag.feet": "Feet",
|
"hud.bag.feet": "Feet",
|
||||||
"hud.bag.mainhand": "Mainhand",
|
"hud.bag.mainhand": "Mainhand",
|
||||||
"hud.bag.offhand": "Offhand",
|
"hud.bag.offhand": "Offhand",
|
||||||
|
|
||||||
|
|
||||||
// Map and Questlog
|
// Map and Questlog
|
||||||
@ -256,7 +256,7 @@ magically infused items?"#,
|
|||||||
"hud.settings.custom_scaling": "Custom Scaling",
|
"hud.settings.custom_scaling": "Custom Scaling",
|
||||||
"hud.settings.crosshair": "Crosshair",
|
"hud.settings.crosshair": "Crosshair",
|
||||||
"hud.settings.transparency": "Transparency",
|
"hud.settings.transparency": "Transparency",
|
||||||
"hud.settings.hotbar": "Hotbar",
|
"hud.settings.hotbar": "Hotbar",
|
||||||
"hud.settings.toggle_shortcuts": "Toggle Shortcuts",
|
"hud.settings.toggle_shortcuts": "Toggle Shortcuts",
|
||||||
"hud.settings.toggle_bar_experience": "Toggle Experience Bar",
|
"hud.settings.toggle_bar_experience": "Toggle Experience Bar",
|
||||||
"hud.settings.scrolling_combat_text": "Scrolling Combat Text",
|
"hud.settings.scrolling_combat_text": "Scrolling Combat Text",
|
||||||
@ -313,7 +313,7 @@ magically infused items?"#,
|
|||||||
|
|
||||||
"hud.spell": "Spells",
|
"hud.spell": "Spells",
|
||||||
|
|
||||||
"hud.free_look_indicator": "Free look active",
|
"hud.free_look_indicator": "Free look active",
|
||||||
"hud.auto_walk_indicator": "Auto walk active",
|
"hud.auto_walk_indicator": "Auto walk active",
|
||||||
|
|
||||||
/// End HUD section
|
/// End HUD section
|
||||||
@ -323,7 +323,7 @@ magically infused items?"#,
|
|||||||
|
|
||||||
"gameinput.primary": "Basic Attack",
|
"gameinput.primary": "Basic Attack",
|
||||||
"gameinput.secondary": "Secondary Attack/Block/Aim",
|
"gameinput.secondary": "Secondary Attack/Block/Aim",
|
||||||
"gameinput.slot1": "Hotbar Slot 1",
|
"gameinput.slot1": "Hotbar Slot 1",
|
||||||
"gameinput.slot2": "Hotbar Slot 2",
|
"gameinput.slot2": "Hotbar Slot 2",
|
||||||
"gameinput.slot3": "Hotbar Slot 3",
|
"gameinput.slot3": "Hotbar Slot 3",
|
||||||
"gameinput.slot4": "Hotbar Slot 4",
|
"gameinput.slot4": "Hotbar Slot 4",
|
||||||
@ -369,7 +369,7 @@ magically infused items?"#,
|
|||||||
"gameinput.freelook": "Free Look",
|
"gameinput.freelook": "Free Look",
|
||||||
"gameinput.autowalk": "Auto Walk",
|
"gameinput.autowalk": "Auto Walk",
|
||||||
"gameinput.dance": "Dance",
|
"gameinput.dance": "Dance",
|
||||||
|
|
||||||
/// End GameInput section
|
/// End GameInput section
|
||||||
|
|
||||||
|
|
||||||
@ -390,7 +390,7 @@ magically infused items?"#,
|
|||||||
"char_selection.plains_of_uncertainty": "Plains of Uncertainty",
|
"char_selection.plains_of_uncertainty": "Plains of Uncertainty",
|
||||||
"char_selection.beard": "Beard",
|
"char_selection.beard": "Beard",
|
||||||
"char_selection.hair_style": "Hair Style",
|
"char_selection.hair_style": "Hair Style",
|
||||||
"char_selection.hair_color": "Hair Color",
|
"char_selection.hair_color": "Hair Color",
|
||||||
"char_selection.eye_color": "Eye Color",
|
"char_selection.eye_color": "Eye Color",
|
||||||
"char_selection.skin": "Skin",
|
"char_selection.skin": "Skin",
|
||||||
"char_selection.eyeshape": "Eye Details",
|
"char_selection.eyeshape": "Eye Details",
|
||||||
|
|||||||
@ -200,7 +200,7 @@
|
|||||||
Tool(Staff(Sceptre)): VoxTrans(
|
Tool(Staff(Sceptre)): VoxTrans(
|
||||||
"voxel.weapon.staff.wood-nature",
|
"voxel.weapon.staff.wood-nature",
|
||||||
(1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.2,
|
(1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.2,
|
||||||
),
|
),
|
||||||
// Shields
|
// Shields
|
||||||
Tool(Shield(BasicShield)): VoxTrans(
|
Tool(Shield(BasicShield)): VoxTrans(
|
||||||
"voxel.weapon.shield.wood-0",
|
"voxel.weapon.shield.wood-0",
|
||||||
@ -219,11 +219,11 @@
|
|||||||
Lantern(Red0): Png(
|
Lantern(Red0): Png(
|
||||||
"element.icons.lantern_red-0",
|
"element.icons.lantern_red-0",
|
||||||
),
|
),
|
||||||
// Farming Equipment
|
// Farming Equipment
|
||||||
Tool(Farming(Broom)): VoxTrans(
|
Tool(Farming(Broom)): VoxTrans(
|
||||||
"voxel.weapon.tool.broom-0",
|
"voxel.weapon.tool.broom-0",
|
||||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||||
),
|
),
|
||||||
Tool(Farming(Hoe0)): VoxTrans(
|
Tool(Farming(Hoe0)): VoxTrans(
|
||||||
"voxel.weapon.tool.hoe_green",
|
"voxel.weapon.tool.hoe_green",
|
||||||
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
||||||
@ -231,7 +231,7 @@
|
|||||||
Tool(Farming(Hoe1)): VoxTrans(
|
Tool(Farming(Hoe1)): VoxTrans(
|
||||||
"voxel.weapon.tool.hoe_blue",
|
"voxel.weapon.tool.hoe_blue",
|
||||||
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
||||||
),
|
),
|
||||||
Tool(Farming(Pitchfork)): VoxTrans(
|
Tool(Farming(Pitchfork)): VoxTrans(
|
||||||
"voxel.weapon.tool.pitchfork-0",
|
"voxel.weapon.tool.pitchfork-0",
|
||||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||||
@ -255,7 +255,7 @@
|
|||||||
Tool(Farming(Shovel0)): VoxTrans(
|
Tool(Farming(Shovel0)): VoxTrans(
|
||||||
"voxel.weapon.tool.shovel_green",
|
"voxel.weapon.tool.shovel_green",
|
||||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||||
),
|
),
|
||||||
Tool(Farming(Shovel1)): VoxTrans(
|
Tool(Farming(Shovel1)): VoxTrans(
|
||||||
"voxel.weapon.tool.shovel_gold",
|
"voxel.weapon.tool.shovel_gold",
|
||||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||||
@ -264,7 +264,7 @@
|
|||||||
// Other
|
// Other
|
||||||
Utility(Collar): Png(
|
Utility(Collar): Png(
|
||||||
"element.icons.collar",
|
"element.icons.collar",
|
||||||
),
|
),
|
||||||
// Armor
|
// Armor
|
||||||
// Starter Parts
|
// Starter Parts
|
||||||
Armor(Foot(Sandal0)): VoxTrans(
|
Armor(Foot(Sandal0)): VoxTrans(
|
||||||
@ -311,7 +311,7 @@
|
|||||||
Armor(Pants(CultistBlue)): VoxTrans(
|
Armor(Pants(CultistBlue)): VoxTrans(
|
||||||
"voxel.armor.pants.cultist",
|
"voxel.armor.pants.cultist",
|
||||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||||
),
|
),
|
||||||
Armor(Hand(CultistBlue)): VoxTrans(
|
Armor(Hand(CultistBlue)): VoxTrans(
|
||||||
"voxel.armor.hand.cultist_right",
|
"voxel.armor.hand.cultist_right",
|
||||||
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
|
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
|
||||||
@ -680,7 +680,7 @@
|
|||||||
Armor(Shoulder(LeafyShoulder)): VoxTrans(
|
Armor(Shoulder(LeafyShoulder)): VoxTrans(
|
||||||
"voxel.armor.shoulder.twigsleaves_shoulder_right",
|
"voxel.armor.shoulder.twigsleaves_shoulder_right",
|
||||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||||
),
|
),
|
||||||
//TwigsFlowers Set
|
//TwigsFlowers Set
|
||||||
Armor(Chest(Twigsflowers)): VoxTrans(
|
Armor(Chest(Twigsflowers)): VoxTrans(
|
||||||
"voxel.armor.chest.twigsflowers_chest",
|
"voxel.armor.chest.twigsflowers_chest",
|
||||||
@ -710,7 +710,7 @@
|
|||||||
Armor(Pants(Hunting)): VoxTrans(
|
Armor(Pants(Hunting)): VoxTrans(
|
||||||
"voxel.armor.pants.grayscale",
|
"voxel.armor.pants.grayscale",
|
||||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||||
),
|
),
|
||||||
// Backs
|
// Backs
|
||||||
Armor(Back(Short0)): VoxTrans(
|
Armor(Back(Short0)): VoxTrans(
|
||||||
"voxel.armor.back.short-0",
|
"voxel.armor.back.short-0",
|
||||||
@ -722,15 +722,15 @@
|
|||||||
),
|
),
|
||||||
// Rings
|
// Rings
|
||||||
Armor(Ring(Ring0)): Png(
|
Armor(Ring(Ring0)): Png(
|
||||||
"element.icons.ring-0",
|
"element.icons.ring-0",
|
||||||
),
|
),
|
||||||
// Necks
|
// Necks
|
||||||
Armor(Neck(Neck0)): Png(
|
Armor(Neck(Neck0)): Png(
|
||||||
"element.icons.neck-0",
|
"element.icons.neck-0",
|
||||||
),
|
),
|
||||||
// Tabards
|
// Tabards
|
||||||
Armor(Tabard(Admin)): Png(
|
Armor(Tabard(Admin)): Png(
|
||||||
"element.icons.tabard_admin",
|
"element.icons.tabard_admin",
|
||||||
),
|
),
|
||||||
// Heads
|
// Heads
|
||||||
Armor(Head(Leather0)): VoxTrans(
|
Armor(Head(Leather0)): VoxTrans(
|
||||||
@ -746,7 +746,7 @@
|
|||||||
VoxTrans(
|
VoxTrans(
|
||||||
"element.icons.item_apple",
|
"element.icons.item_apple",
|
||||||
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 1.0,
|
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 1.0,
|
||||||
),
|
),
|
||||||
Consumable(Coconut): Png(
|
Consumable(Coconut): Png(
|
||||||
"element.icons.item_coconut",
|
"element.icons.item_coconut",
|
||||||
),
|
),
|
||||||
@ -761,7 +761,7 @@
|
|||||||
Consumable(Cheese): VoxTrans(
|
Consumable(Cheese): VoxTrans(
|
||||||
"element.icons.item_cheese",
|
"element.icons.item_cheese",
|
||||||
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 0.9,
|
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 0.9,
|
||||||
),
|
),
|
||||||
Consumable(Potion): VoxTrans(
|
Consumable(Potion): VoxTrans(
|
||||||
"voxel.object.potion_red",
|
"voxel.object.potion_red",
|
||||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.0,
|
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.0,
|
||||||
@ -778,6 +778,15 @@
|
|||||||
"voxel.sprite.velorite.velorite_1",
|
"voxel.sprite.velorite.velorite_1",
|
||||||
(0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
|
(0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
|
||||||
),
|
),
|
||||||
|
// Throwables
|
||||||
|
Throwable(Bomb): VoxTrans(
|
||||||
|
"voxel.object.bomb",
|
||||||
|
(0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
|
||||||
|
),
|
||||||
|
Throwable(TrainingDummy): VoxTrans(
|
||||||
|
"voxel.object.training_dummy",
|
||||||
|
(0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
|
||||||
|
),
|
||||||
// Ingredients
|
// Ingredients
|
||||||
Ingredient(Flower): VoxTrans(
|
Ingredient(Flower): VoxTrans(
|
||||||
"voxel.sprite.flowers.flower_red_2",
|
"voxel.sprite.flowers.flower_red_2",
|
||||||
@ -791,5 +800,5 @@
|
|||||||
Tool(Debug(Boost)): VoxTrans(
|
Tool(Debug(Boost)): VoxTrans(
|
||||||
"voxel.weapon.tool.broom_belzeshrub_purple",
|
"voxel.weapon.tool.broom_belzeshrub_purple",
|
||||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -250,7 +250,8 @@ void main() {
|
|||||||
|
|
||||||
emitted_light = vec3(1.0);
|
emitted_light = vec3(1.0);
|
||||||
reflected_light = vec3(1.0);
|
reflected_light = vec3(1.0);
|
||||||
max_light += get_sun_diffuse2(/*time_of_day.x, */sun_info, moon_info, f_norm, view_dir, f_pos, mu, cam_attenuation, fluid_alt, k_a/* * (shade_frac * 0.5 + light_frac * 0.5)*/, k_d, k_s, alpha, f_norm, 1.0, emitted_light, reflected_light);
|
float f_select = (select_pos.w > 0 && select_pos.xyz == floor(f_pos - f_norm * 0.5)) ? 1.0 / PERSISTENT_AMBIANCE : 1.0;
|
||||||
|
max_light += get_sun_diffuse2(/*time_of_day.x, */sun_info, moon_info, f_norm, view_dir, f_pos, mu, cam_attenuation, fluid_alt, k_a * f_select/* * (shade_frac * 0.5 + light_frac * 0.5)*/, k_d, k_s, alpha, f_norm, 1.0, emitted_light, reflected_light);
|
||||||
|
|
||||||
// emitted_light *= f_light * point_shadow * max(shade_frac, MIN_SHADOW);
|
// emitted_light *= f_light * point_shadow * max(shade_frac, MIN_SHADOW);
|
||||||
// reflected_light *= f_light * point_shadow * shade_frac;
|
// reflected_light *= f_light * point_shadow * shade_frac;
|
||||||
|
|||||||
@ -16,15 +16,15 @@
|
|||||||
(Ogre, Female): (
|
(Ogre, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-8.0, -5.0, -6.0),
|
offset: (-8.0, -5.0, -6.0),
|
||||||
center: ("npc.ogre.female.head"),
|
center: ("npc.ogre.male.head"),
|
||||||
),
|
),
|
||||||
torso_upper: (
|
torso_upper: (
|
||||||
offset: (-8.0, -4.5, -5.0),
|
offset: (-8.0, -4.5, -5.0),
|
||||||
center: ("npc.ogre.female.torso_upper"),
|
center: ("npc.ogre.male.torso_upper"),
|
||||||
),
|
),
|
||||||
torso_lower: (
|
torso_lower: (
|
||||||
offset: (-5.0, -4.5, -4.5),
|
offset: (-5.0, -4.5, -4.5),
|
||||||
center: ("npc.ogre.female.torso_lower"),
|
center: ("npc.ogre.male.torso_lower"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Cyclops, Male): (
|
(Cyclops, Male): (
|
||||||
@ -44,15 +44,15 @@
|
|||||||
(Cyclops, Female): (
|
(Cyclops, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-7.0, -7.0, -6.5),
|
offset: (-7.0, -7.0, -6.5),
|
||||||
center: ("npc.cyclops.female.head"),
|
center: ("npc.cyclops.male.head"),
|
||||||
),
|
),
|
||||||
torso_upper: (
|
torso_upper: (
|
||||||
offset: (-8.0, -6.0, -6.0),
|
offset: (-8.0, -6.0, -6.0),
|
||||||
center: ("npc.cyclops.female.torso_upper"),
|
center: ("npc.cyclops.male.torso_upper"),
|
||||||
),
|
),
|
||||||
torso_lower: (
|
torso_lower: (
|
||||||
offset: (-6.0, -5.5, -6.0),
|
offset: (-6.0, -5.5, -6.0),
|
||||||
center: ("npc.cyclops.female.torso_lower"),
|
center: ("npc.cyclops.male.torso_lower"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -40,31 +40,31 @@
|
|||||||
),
|
),
|
||||||
shoulder_r: (
|
shoulder_r: (
|
||||||
offset: (-4.0, -5.5, -4.0),
|
offset: (-4.0, -5.5, -4.0),
|
||||||
lateral: ("npc.ogre.female.shoulder_r"),
|
lateral: ("npc.ogre.male.shoulder_r"),
|
||||||
),
|
),
|
||||||
hand_l: (
|
hand_l: (
|
||||||
offset: (-2.5, -2.5, -11.0),
|
offset: (-2.5, -2.5, -11.0),
|
||||||
lateral: ("npc.ogre.female.hand_l"),
|
lateral: ("npc.ogre.male.hand_l"),
|
||||||
),
|
),
|
||||||
hand_r: (
|
hand_r: (
|
||||||
offset: (-2.5, -2.5, -11.0),
|
offset: (-2.5, -2.5, -11.0),
|
||||||
lateral: ("npc.ogre.female.hand_r"),
|
lateral: ("npc.ogre.male.hand_r"),
|
||||||
),
|
),
|
||||||
leg_l: (
|
leg_l: (
|
||||||
offset: (-6.0, -3.5, -7.0),
|
offset: (-6.0, -3.5, -7.0),
|
||||||
lateral: ("npc.ogre.female.leg_l"),
|
lateral: ("npc.ogre.male.leg_l"),
|
||||||
),
|
),
|
||||||
leg_r: (
|
leg_r: (
|
||||||
offset: (0.0, -3.5, -7.0),
|
offset: (0.0, -3.5, -7.0),
|
||||||
lateral: ("npc.ogre.female.leg_r"),
|
lateral: ("npc.ogre.male.leg_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-3.0, -5.0, -2.5),
|
offset: (-3.0, -5.0, -2.5),
|
||||||
lateral: ("npc.ogre.female.foot_l"),
|
lateral: ("npc.ogre.male.foot_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-3.0, -5.0, -2.5),
|
offset: (-3.0, -5.0, -2.5),
|
||||||
lateral: ("npc.ogre.female.foot_r"),
|
lateral: ("npc.ogre.male.foot_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Cyclops, Male): (
|
(Cyclops, Male): (
|
||||||
@ -104,35 +104,35 @@
|
|||||||
(Cyclops, Female): (
|
(Cyclops, Female): (
|
||||||
shoulder_l: (
|
shoulder_l: (
|
||||||
offset: (-3.0, -4.0, -5.0),
|
offset: (-3.0, -4.0, -5.0),
|
||||||
lateral: ("npc.cyclops.female.shoulder_l"),
|
lateral: ("npc.cyclops.male.shoulder_l"),
|
||||||
),
|
),
|
||||||
shoulder_r: (
|
shoulder_r: (
|
||||||
offset: (-3.0, -4.0, -5.0),
|
offset: (-3.0, -4.0, -5.0),
|
||||||
lateral: ("npc.cyclops.female.shoulder_r"),
|
lateral: ("npc.cyclops.male.shoulder_r"),
|
||||||
),
|
),
|
||||||
hand_l: (
|
hand_l: (
|
||||||
offset: (-3.5, -3.5, -14.0),
|
offset: (-3.5, -3.5, -14.0),
|
||||||
lateral: ("npc.cyclops.female.hand_l"),
|
lateral: ("npc.cyclops.male.hand_l"),
|
||||||
),
|
),
|
||||||
hand_r: (
|
hand_r: (
|
||||||
offset: (-3.5, -3.5, -14.0),
|
offset: (-3.5, -3.5, -14.0),
|
||||||
lateral: ("npc.cyclops.female.hand_r"),
|
lateral: ("npc.cyclops.male.hand_r"),
|
||||||
),
|
),
|
||||||
leg_l: (
|
leg_l: (
|
||||||
offset: (-6.0, -3.5, -7.0),
|
offset: (-6.0, -3.5, -7.0),
|
||||||
lateral: ("npc.cyclops.female.leg_l"),
|
lateral: ("npc.cyclops.male.leg_l"),
|
||||||
),
|
),
|
||||||
leg_r: (
|
leg_r: (
|
||||||
offset: (0.0, -3.5, -7.0),
|
offset: (0.0, -3.5, -7.0),
|
||||||
lateral: ("npc.cyclops.female.leg_r"),
|
lateral: ("npc.cyclops.male.leg_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-3.0, -5.0, -5.0),
|
offset: (-3.0, -5.0, -5.0),
|
||||||
lateral: ("npc.cyclops.female.foot_l"),
|
lateral: ("npc.cyclops.male.foot_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-3.0, -5.0, -5.0),
|
offset: (-3.0, -5.0, -5.0),
|
||||||
lateral: ("npc.cyclops.female.foot_r"),
|
lateral: ("npc.cyclops.male.foot_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -72,15 +72,15 @@
|
|||||||
(Goose, Female): (
|
(Goose, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.0, -3.5, -2.5),
|
offset: (-2.0, -3.5, -2.5),
|
||||||
center: ("npc.goose.female.head"),
|
center: ("npc.goose.male.head"),
|
||||||
),
|
),
|
||||||
torso: (
|
torso: (
|
||||||
offset: (-3.5, -4.5, -3.0),
|
offset: (-3.5, -4.5, -3.0),
|
||||||
center: ("npc.goose.female.torso"),
|
center: ("npc.goose.male.torso"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-2.0, -1.0, -3.5),
|
offset: (-2.0, -1.0, -3.5),
|
||||||
center: ("npc.goose.female.tail"),
|
center: ("npc.goose.male.tail"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Peacock, Male): (
|
(Peacock, Male): (
|
||||||
@ -128,15 +128,15 @@
|
|||||||
(Eagle, Female): (
|
(Eagle, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.0, -2.0, -3.5),
|
offset: (-2.0, -2.0, -3.5),
|
||||||
center: ("npc.eagle.female.head"),
|
center: ("npc.eagle.male.head"),
|
||||||
),
|
),
|
||||||
torso: (
|
torso: (
|
||||||
offset: (-3.0, -4.5, -4.5),
|
offset: (-3.0, -4.5, -4.5),
|
||||||
center: ("npc.eagle.female.torso"),
|
center: ("npc.eagle.male.torso"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-2.0, -3.5, -3.5),
|
offset: (-2.0, -3.5, -3.5),
|
||||||
center: ("npc.eagle.female.tail"),
|
center: ("npc.eagle.male.tail"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Snowyowl, Male): (
|
(Snowyowl, Male): (
|
||||||
@ -156,15 +156,15 @@
|
|||||||
(Snowyowl, Female): (
|
(Snowyowl, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-3.5, -4.5, -4.0),
|
offset: (-3.5, -4.5, -4.0),
|
||||||
center: ("npc.snowyowl.female.head"),
|
center: ("npc.snowyowl.male.head"),
|
||||||
),
|
),
|
||||||
torso: (
|
torso: (
|
||||||
offset: (-3.5, -5.0, -3.0),
|
offset: (-3.5, -5.0, -3.0),
|
||||||
center: ("npc.snowyowl.female.torso"),
|
center: ("npc.snowyowl.male.torso"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-2.5, -3.0, -2.0),
|
offset: (-2.5, -3.0, -2.0),
|
||||||
center: ("npc.snowyowl.female.tail"),
|
center: ("npc.snowyowl.male.tail"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Parrot, Male): (
|
(Parrot, Male): (
|
||||||
@ -184,15 +184,15 @@
|
|||||||
(Parrot, Female): (
|
(Parrot, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-1.5, -1.5, -2.5),
|
offset: (-1.5, -1.5, -2.5),
|
||||||
center: ("npc.parrot.female.head"),
|
center: ("npc.parrot.male.head"),
|
||||||
),
|
),
|
||||||
torso: (
|
torso: (
|
||||||
offset: (-1.5, -3.5, -3.5),
|
offset: (-1.5, -3.5, -3.5),
|
||||||
center: ("npc.parrot.female.torso"),
|
center: ("npc.parrot.male.torso"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-1.5, -4.5, -1.5),
|
offset: (-1.5, -4.5, -1.5),
|
||||||
center: ("npc.parrot.female.tail"),
|
center: ("npc.parrot.male.tail"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Cockatrice, Male): (
|
(Cockatrice, Male): (
|
||||||
@ -212,15 +212,15 @@
|
|||||||
(Cockatrice, Female): (
|
(Cockatrice, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.5, -3.5, -8.0),
|
offset: (-2.5, -3.5, -8.0),
|
||||||
center: ("npc.cockatrice.female.head"),
|
center: ("npc.cockatrice.male.head"),
|
||||||
),
|
),
|
||||||
torso: (
|
torso: (
|
||||||
offset: (-3.5, -6.5, -7.5),
|
offset: (-3.5, -6.5, -7.5),
|
||||||
center: ("npc.cockatrice.female.torso"),
|
center: ("npc.cockatrice.male.torso"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-1.5, -3.5, -4.0),
|
offset: (-1.5, -3.5, -4.0),
|
||||||
center: ("npc.cockatrice.female.tail"),
|
center: ("npc.cockatrice.male.tail"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
@ -92,19 +92,19 @@
|
|||||||
(Goose, Female): (
|
(Goose, Female): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-0.5, -2.5, -4.0),
|
offset: (-0.5, -2.5, -4.0),
|
||||||
lateral: ("npc.goose.female.wing"),
|
lateral: ("npc.goose.male.wing"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-0.5, -2.5, -4.0),
|
offset: (-0.5, -2.5, -4.0),
|
||||||
lateral: ("npc.goose.female.wing"),
|
lateral: ("npc.goose.male.wing"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-1.0, 0.0, -6.5),
|
offset: (-1.0, 0.0, -6.5),
|
||||||
lateral: ("npc.goose.female.leg_l"),
|
lateral: ("npc.goose.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-1.0, 0.0, -6.5),
|
offset: (-1.0, 0.0, -6.5),
|
||||||
lateral: ("npc.goose.female.leg_r"),
|
lateral: ("npc.goose.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Peacock, Male): (
|
(Peacock, Male): (
|
||||||
@ -164,19 +164,19 @@
|
|||||||
(Eagle, Female): (
|
(Eagle, Female): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-1.0, -3.5, -12.0),
|
offset: (-1.0, -3.5, -12.0),
|
||||||
lateral: ("npc.eagle.female.wing_l"),
|
lateral: ("npc.eagle.male.wing_l"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-1.0, -3.5, -12.0),
|
offset: (-1.0, -3.5, -12.0),
|
||||||
lateral: ("npc.eagle.female.wing_r"),
|
lateral: ("npc.eagle.male.wing_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-1.5, 0.0, -8.0),
|
offset: (-1.5, 0.0, -8.0),
|
||||||
lateral: ("npc.eagle.female.leg_l"),
|
lateral: ("npc.eagle.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-1.5, 0.0, -8.0),
|
offset: (-1.5, 0.0, -8.0),
|
||||||
lateral: ("npc.eagle.female.leg_r"),
|
lateral: ("npc.eagle.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Snowyowl, Male): (
|
(Snowyowl, Male): (
|
||||||
@ -200,55 +200,55 @@
|
|||||||
(Snowyowl, Female): (
|
(Snowyowl, Female): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-1.0, -2.5, -8.0),
|
offset: (-1.0, -2.5, -8.0),
|
||||||
lateral: ("npc.snowyowl.female.wing_l"),
|
lateral: ("npc.snowyowl.male.wing_l"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-1.0, -2.5, -8.0),
|
offset: (-1.0, -2.5, -8.0),
|
||||||
lateral: ("npc.snowyowl.female.wing_r"),
|
lateral: ("npc.snowyowl.male.wing_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-1.0, 0.0, -6.5),
|
offset: (-1.0, 0.0, -6.5),
|
||||||
lateral: ("npc.snowyowl.female.leg_l"),
|
lateral: ("npc.snowyowl.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-1.0, 0.0, -6.5),
|
offset: (-1.0, 0.0, -6.5),
|
||||||
lateral: ("npc.snowyowl.female.leg_r"),
|
lateral: ("npc.snowyowl.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Parrot, Male): (
|
(Parrot, Male): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-0.5, -2.5, -8.0),
|
offset: (-0.5, -2.5, -8.0),
|
||||||
lateral: ("npc.parrot.female.wing"),
|
lateral: ("npc.parrot.male.wing"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-0.5, -2.5, -8.0),
|
offset: (-0.5, -2.5, -8.0),
|
||||||
lateral: ("npc.parrot.female.wing"),
|
lateral: ("npc.parrot.male.wing"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-1.0, 0.0, -3.0),
|
offset: (-1.0, 0.0, -3.0),
|
||||||
lateral: ("npc.parrot.female.leg_l"),
|
lateral: ("npc.parrot.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-1.0, 0.0, -3.0),
|
offset: (-1.0, 0.0, -3.0),
|
||||||
lateral: ("npc.parrot.female.leg_r"),
|
lateral: ("npc.parrot.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Parrot, Female): (
|
(Parrot, Female): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-0.5, -2.5, -8.0),
|
offset: (-0.5, -2.5, -8.0),
|
||||||
lateral: ("npc.parrot.female.wing"),
|
lateral: ("npc.parrot.male.wing"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-0.5, -2.5, -8.0),
|
offset: (-0.5, -2.5, -8.0),
|
||||||
lateral: ("npc.parrot.female.wing"),
|
lateral: ("npc.parrot.male.wing"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-1.0, 0.0, -3.0),
|
offset: (-1.0, 0.0, -3.0),
|
||||||
lateral: ("npc.parrot.female.leg_l"),
|
lateral: ("npc.parrot.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-1.0, 0.0, -3.0),
|
offset: (-1.0, 0.0, -3.0),
|
||||||
lateral: ("npc.parrot.female.leg_r"),
|
lateral: ("npc.parrot.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
(Cockatrice, Male): (
|
(Cockatrice, Male): (
|
||||||
@ -272,19 +272,19 @@
|
|||||||
(Cockatrice, Female): (
|
(Cockatrice, Female): (
|
||||||
wing_l: (
|
wing_l: (
|
||||||
offset: (-2.0, -3.0, -9.0),
|
offset: (-2.0, -3.0, -9.0),
|
||||||
lateral: ("npc.cockatrice.female.wing_l"),
|
lateral: ("npc.cockatrice.male.wing_l"),
|
||||||
),
|
),
|
||||||
wing_r: (
|
wing_r: (
|
||||||
offset: (-2.0, -3.0, -9.0),
|
offset: (-2.0, -3.0, -9.0),
|
||||||
lateral: ("npc.cockatrice.female.wing_r"),
|
lateral: ("npc.cockatrice.male.wing_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-2.5, 0.0, -12.0),
|
offset: (-2.5, 0.0, -12.0),
|
||||||
lateral: ("npc.cockatrice.female.leg_l"),
|
lateral: ("npc.cockatrice.male.leg_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-2.5, 0.0, -12.0),
|
offset: (-2.5, 0.0, -12.0),
|
||||||
lateral: ("npc.cockatrice.female.leg_r"),
|
lateral: ("npc.cockatrice.male.leg_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
@ -24,23 +24,23 @@
|
|||||||
(Rat, Female): (
|
(Rat, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-4.5, -4.0, -4.0),
|
offset: (-4.5, -4.0, -4.0),
|
||||||
center: ("npc.rat.female.head"),
|
center: ("npc.rat.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-4.5, -6.0, -4.0),
|
offset: (-4.5, -6.0, -4.0),
|
||||||
center: ("npc.rat.female.chest"),
|
center: ("npc.rat.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-4.0, -1.5, -1.0),
|
offset: (-4.0, -1.5, -1.0),
|
||||||
center: ("npc.rat.female.feet_f"),
|
center: ("npc.rat.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-4.0, -1.5, -1.0),
|
offset: (-4.0, -1.5, -1.0),
|
||||||
center: ("npc.rat.female.feet_b"),
|
center: ("npc.rat.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-0.5, -4.0, -1.5),
|
offset: (-0.5, -4.0, -1.5),
|
||||||
center: ("npc.rat.female.tail"),
|
center: ("npc.rat.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(Axolotl, Male): (
|
(Axolotl, Male): (
|
||||||
@ -68,23 +68,23 @@
|
|||||||
(Axolotl, Female): (
|
(Axolotl, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-3.5, -4.0, -2.0),
|
offset: (-3.5, -4.0, -2.0),
|
||||||
center: ("npc.axolotl.female.head"),
|
center: ("npc.axolotl.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-2.5, -4.0, -1.5),
|
offset: (-2.5, -4.0, -1.5),
|
||||||
center: ("npc.axolotl.female.chest"),
|
center: ("npc.axolotl.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-3.0, -0.5, -1.0),
|
offset: (-3.0, -0.5, -1.0),
|
||||||
center: ("npc.axolotl.female.feet_f"),
|
center: ("npc.axolotl.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-3.0, -0.5, -1.0),
|
offset: (-3.0, -0.5, -1.0),
|
||||||
center: ("npc.axolotl.female.feet_b"),
|
center: ("npc.axolotl.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-1.5, -2.5, -1.5),
|
offset: (-1.5, -2.5, -1.5),
|
||||||
center: ("npc.axolotl.female.tail"),
|
center: ("npc.axolotl.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(Gecko, Male): (
|
(Gecko, Male): (
|
||||||
@ -112,23 +112,23 @@
|
|||||||
(Gecko, Female): (
|
(Gecko, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.5, -3.0, -2.0),
|
offset: (-2.5, -3.0, -2.0),
|
||||||
center: ("npc.gecko.female.head"),
|
center: ("npc.gecko.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-1.5, -4.0, -1.5),
|
offset: (-1.5, -4.0, -1.5),
|
||||||
center: ("npc.gecko.female.chest"),
|
center: ("npc.gecko.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-2.0, -0.5, -1.0),
|
offset: (-2.0, -0.5, -1.0),
|
||||||
center: ("npc.gecko.female.feet_f"),
|
center: ("npc.gecko.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-2.0, -0.5, -1.0),
|
offset: (-2.0, -0.5, -1.0),
|
||||||
center: ("npc.gecko.female.feet_b"),
|
center: ("npc.gecko.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-0.5, -2.5, -1.0),
|
offset: (-0.5, -2.5, -1.0),
|
||||||
center: ("npc.gecko.female.tail"),
|
center: ("npc.gecko.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(Turtle, Male): (
|
(Turtle, Male): (
|
||||||
@ -156,23 +156,23 @@
|
|||||||
(Turtle, Female): (
|
(Turtle, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.5, -2.5, -2.5),
|
offset: (-2.5, -2.5, -2.5),
|
||||||
center: ("npc.turtle.female.head"),
|
center: ("npc.turtle.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-6.0, -6.0, -4.0),
|
offset: (-6.0, -6.0, -4.0),
|
||||||
center: ("npc.turtle.female.chest"),
|
center: ("npc.turtle.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-5.0, -0.5, -1.0),
|
offset: (-5.0, -0.5, -1.0),
|
||||||
center: ("npc.turtle.female.feet_f"),
|
center: ("npc.turtle.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-5.0, -0.5, -1.0),
|
offset: (-5.0, -0.5, -1.0),
|
||||||
center: ("npc.turtle.female.feet_b"),
|
center: ("npc.turtle.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-0.5, -2.0, -1.0),
|
offset: (-0.5, -2.0, -1.0),
|
||||||
center: ("npc.turtle.female.tail"),
|
center: ("npc.turtle.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(Squirrel, Male): (
|
(Squirrel, Male): (
|
||||||
@ -200,23 +200,23 @@
|
|||||||
(Squirrel, Female): (
|
(Squirrel, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-1.5, -2.0, -2.0),
|
offset: (-1.5, -2.0, -2.0),
|
||||||
center: ("npc.squirrel.female.head"),
|
center: ("npc.squirrel.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-1.5, -3.0, -1.5),
|
offset: (-1.5, -3.0, -1.5),
|
||||||
center: ("npc.squirrel.female.chest"),
|
center: ("npc.squirrel.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-2.0, -0.5, -1.0),
|
offset: (-2.0, -0.5, -1.0),
|
||||||
center: ("npc.squirrel.female.feet_f"),
|
center: ("npc.squirrel.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-2.0, -0.5, -1.0),
|
offset: (-2.0, -0.5, -1.0),
|
||||||
center: ("npc.squirrel.female.feet_b"),
|
center: ("npc.squirrel.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-1.5, -1.5, -3.0),
|
offset: (-1.5, -1.5, -3.0),
|
||||||
center: ("npc.squirrel.female.tail"),
|
center: ("npc.squirrel.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(Fungome, Male): (
|
(Fungome, Male): (
|
||||||
@ -244,23 +244,23 @@
|
|||||||
(Fungome, Female): (
|
(Fungome, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-2.5, -1.5, -2.0),
|
offset: (-2.5, -1.5, -2.0),
|
||||||
center: ("npc.fungome.female.head"),
|
center: ("npc.fungome.male.head"),
|
||||||
),
|
),
|
||||||
chest: (
|
chest: (
|
||||||
offset: (-6.0, -6.0, -4.0),
|
offset: (-6.0, -6.0, -4.0),
|
||||||
center: ("npc.fungome.female.chest"),
|
center: ("npc.fungome.male.chest"),
|
||||||
),
|
),
|
||||||
feet_f: (
|
feet_f: (
|
||||||
offset: (-3.0, -0.5, -1.0),
|
offset: (-3.0, -0.5, -1.0),
|
||||||
center: ("npc.fungome.female.feet_f"),
|
center: ("npc.fungome.male.feet_f"),
|
||||||
),
|
),
|
||||||
feet_b: (
|
feet_b: (
|
||||||
offset: (-3.0, -0.5, -1.0),
|
offset: (-3.0, -0.5, -1.0),
|
||||||
center: ("npc.fungome.female.feet_b"),
|
center: ("npc.fungome.male.feet_b"),
|
||||||
),
|
),
|
||||||
tail: (
|
tail: (
|
||||||
offset: (-1.0, -0.5, -1.0),
|
offset: (-1.0, -0.5, -1.0),
|
||||||
center: ("npc.fungome.female.tail"),
|
center: ("npc.fungome.male.tail"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -32,31 +32,31 @@
|
|||||||
(Reddragon, Female): (
|
(Reddragon, Female): (
|
||||||
upper: (
|
upper: (
|
||||||
offset: (-6.5, -2.0, -6.0),
|
offset: (-6.5, -2.0, -6.0),
|
||||||
center: ("npc.reddragon.female.head_upper"),
|
center: ("npc.reddragon.male.head_upper"),
|
||||||
),
|
),
|
||||||
lower: (
|
lower: (
|
||||||
offset: (-2.5, -2.0, -5.0),
|
offset: (-2.5, -2.0, -5.0),
|
||||||
center: ("npc.reddragon.female.head_lower"),
|
center: ("npc.reddragon.male.head_lower"),
|
||||||
),
|
),
|
||||||
jaw: (
|
jaw: (
|
||||||
offset: (-3.5, -2.0, -1.5),
|
offset: (-3.5, -2.0, -1.5),
|
||||||
center: ("npc.reddragon.female.jaw"),
|
center: ("npc.reddragon.male.jaw"),
|
||||||
),
|
),
|
||||||
chest_front: (
|
chest_front: (
|
||||||
offset: (-6.5, -6.0, -7.5),
|
offset: (-6.5, -6.0, -7.5),
|
||||||
center: ("npc.reddragon.female.chest_front"),
|
center: ("npc.reddragon.male.chest_front"),
|
||||||
),
|
),
|
||||||
chest_rear: (
|
chest_rear: (
|
||||||
offset: (-6.5, -7.0, -7.0),
|
offset: (-6.5, -7.0, -7.0),
|
||||||
center: ("npc.reddragon.female.chest_rear"),
|
center: ("npc.reddragon.male.chest_rear"),
|
||||||
),
|
),
|
||||||
tail_front: (
|
tail_front: (
|
||||||
offset: (-2.5, -12.0, -3.5),
|
offset: (-2.5, -12.0, -3.5),
|
||||||
center: ("npc.reddragon.female.tail_front"),
|
center: ("npc.reddragon.male.tail_front"),
|
||||||
),
|
),
|
||||||
tail_rear: (
|
tail_rear: (
|
||||||
offset: (-3.5, -16.0, -3.0),
|
offset: (-3.5, -16.0, -3.0),
|
||||||
center: ("npc.reddragon.female.tail_rear"),
|
center: ("npc.reddragon.male.tail_rear"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -36,35 +36,35 @@
|
|||||||
(Reddragon, Female): (
|
(Reddragon, Female): (
|
||||||
wing_in_l: (
|
wing_in_l: (
|
||||||
offset: (-24.0, -3.0, 0.0),
|
offset: (-24.0, -3.0, 0.0),
|
||||||
lateral: ("npc.reddragon.female.wing_in_l"),
|
lateral: ("npc.reddragon.male.wing_in_l"),
|
||||||
),
|
),
|
||||||
wing_in_r: (
|
wing_in_r: (
|
||||||
offset: (0.0, -3.0, 0.0),
|
offset: (0.0, -3.0, 0.0),
|
||||||
lateral: ("npc.reddragon.female.wing_in_r"),
|
lateral: ("npc.reddragon.male.wing_in_r"),
|
||||||
),
|
),
|
||||||
wing_out_l: (
|
wing_out_l: (
|
||||||
offset: (-29.0, -3.0, -4.0),
|
offset: (-29.0, -3.0, -4.0),
|
||||||
lateral: ("npc.reddragon.female.wing_out_l"),
|
lateral: ("npc.reddragon.male.wing_out_l"),
|
||||||
),
|
),
|
||||||
wing_out_r: (
|
wing_out_r: (
|
||||||
offset: (0.0, -3.0, -4.0),
|
offset: (0.0, -3.0, -4.0),
|
||||||
lateral: ("npc.reddragon.female.wing_out_r"),
|
lateral: ("npc.reddragon.male.wing_out_r"),
|
||||||
),
|
),
|
||||||
foot_fl: (
|
foot_fl: (
|
||||||
offset: (-5.5, -4.0, -1.5),
|
offset: (-5.5, -4.0, -1.5),
|
||||||
lateral: ("npc.reddragon.female.foot_fl"),
|
lateral: ("npc.reddragon.male.foot_fl"),
|
||||||
),
|
),
|
||||||
foot_fr: (
|
foot_fr: (
|
||||||
offset: (-5.5, -4.0, -1.5),
|
offset: (-5.5, -4.0, -1.5),
|
||||||
lateral: ("npc.reddragon.female.foot_fr"),
|
lateral: ("npc.reddragon.male.foot_fr"),
|
||||||
),
|
),
|
||||||
foot_bl: (
|
foot_bl: (
|
||||||
offset: (-5.5, -4.0, -3.0),
|
offset: (-5.5, -4.0, -3.0),
|
||||||
lateral: ("npc.reddragon.female.foot_bl"),
|
lateral: ("npc.reddragon.male.foot_bl"),
|
||||||
),
|
),
|
||||||
foot_br: (
|
foot_br: (
|
||||||
offset: (-5.5, -4.0, -3.0),
|
offset: (-5.5, -4.0, -3.0),
|
||||||
lateral: ("npc.reddragon.female.foot_br"),
|
lateral: ("npc.reddragon.male.foot_br"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
@ -12,11 +12,11 @@
|
|||||||
(StoneGolem, Female): (
|
(StoneGolem, Female): (
|
||||||
head: (
|
head: (
|
||||||
offset: (-5.0, -5.5, -7.5),
|
offset: (-5.0, -5.5, -7.5),
|
||||||
center: ("npc.stonegolem.female.head"),
|
center: ("npc.stonegolem.male.head"),
|
||||||
),
|
),
|
||||||
torso_upper: (
|
torso_upper: (
|
||||||
offset: (-6.0, -3.5, -10.0),
|
offset: (-6.0, -3.5, -10.0),
|
||||||
center: ("npc.stonegolem.female.torso_upper"),
|
center: ("npc.stonegolem.male.torso_upper"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -40,31 +40,31 @@
|
|||||||
),
|
),
|
||||||
shoulder_r: (
|
shoulder_r: (
|
||||||
offset: (-4.5, -4.0, -5.0),
|
offset: (-4.5, -4.0, -5.0),
|
||||||
lateral: ("npc.stonegolem.female.shoulder_r"),
|
lateral: ("npc.stonegolem.male.shoulder_r"),
|
||||||
),
|
),
|
||||||
hand_l: (
|
hand_l: (
|
||||||
offset: (-3.0, -3.5, -14.0),
|
offset: (-3.0, -3.5, -14.0),
|
||||||
lateral: ("npc.stonegolem.female.hand_l"),
|
lateral: ("npc.stonegolem.male.hand_l"),
|
||||||
),
|
),
|
||||||
hand_r: (
|
hand_r: (
|
||||||
offset: (-3.0, -3.5, -14.0),
|
offset: (-3.0, -3.5, -14.0),
|
||||||
lateral: ("npc.stonegolem.female.hand_r"),
|
lateral: ("npc.stonegolem.male.hand_r"),
|
||||||
),
|
),
|
||||||
leg_l: (
|
leg_l: (
|
||||||
offset: (-2.5, -2.5, -6.0),
|
offset: (-2.5, -2.5, -6.0),
|
||||||
lateral: ("npc.stonegolem.female.leg_l"),
|
lateral: ("npc.stonegolem.male.leg_l"),
|
||||||
),
|
),
|
||||||
leg_r: (
|
leg_r: (
|
||||||
offset: (-2.5, -2.5, -6.0),
|
offset: (-2.5, -2.5, -6.0),
|
||||||
lateral: ("npc.stonegolem.female.leg_r"),
|
lateral: ("npc.stonegolem.male.leg_r"),
|
||||||
),
|
),
|
||||||
foot_l: (
|
foot_l: (
|
||||||
offset: (-3.0, -3.5, -10.5),
|
offset: (-3.0, -3.5, -10.5),
|
||||||
lateral: ("npc.stonegolem.female.foot_l"),
|
lateral: ("npc.stonegolem.male.foot_l"),
|
||||||
),
|
),
|
||||||
foot_r: (
|
foot_r: (
|
||||||
offset: (-3.0, -3.5, -10.5),
|
offset: (-3.0, -3.5, -10.5),
|
||||||
lateral: ("npc.stonegolem.female.foot_r"),
|
lateral: ("npc.stonegolem.male.foot_r"),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|||||||
BIN
assets/voxygen/voxel/npc/alligator/female/foot_lb.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/foot_lb.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/foot_lf.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/foot_lf.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/foot_rb.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/foot_rb.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/foot_rf.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/foot_rf.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/head_lower.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/head_lower.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/head_upper.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/head_upper.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/jaw.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/jaw.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/torso_back.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/torso_back.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/female/torso_front.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/female/torso_front.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/chest.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/chest.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_bl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/foot_bl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_br.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/foot_br.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_fl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/foot_fl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_fr.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/foot_fr.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_lb.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/foot_lb.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_lf.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/foot_lf.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_rb.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/foot_rb.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/foot_rf.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/foot_rf.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/head_lower.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/head_lower.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/head_upper.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/head_upper.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/jaw.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/jaw.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/tail_front.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/tail_front.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/tail_rear.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/alligator/male/tail_rear.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/torso_back.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/torso_back.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/alligator/male/torso_front.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/alligator/male/torso_front.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/chest.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/chest.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/foot_bl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/foot_bl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/foot_br.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/foot_br.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/foot_fl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/foot_fl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/foot_fr.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/foot_fr.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/head_lower.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/head_lower.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/head_upper.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/head_upper.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/jaw.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/jaw.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/tail_front.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/tail_front.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/asp/male/tail_rear.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/asp/male/tail_rear.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/axolotl/female/chest.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/axolotl/female/chest.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/axolotl/female/feet_b.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/axolotl/female/feet_b.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/axolotl/female/feet_f.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/axolotl/female/feet_f.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/axolotl/female/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/axolotl/female/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/axolotl/female/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/axolotl/female/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/chest.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/chest.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/foot_bl.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/foot_bl.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/foot_br.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/foot_br.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/foot_fl.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/foot_fl.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/foot_fr.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/foot_fr.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/batfox/female/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/batfox/female/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/torso.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/torso.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/chest.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/chest.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_bl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_bl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_br.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_br.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_fl.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_fl.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_fr.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/foot_fr.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/head_lower.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/head_lower.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/head_upper.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/head_upper.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/jaw.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/jaw.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/tail_front.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/tail_front.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/crocodile/male/tail_rear.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/crocodile/male/tail_rear.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/foot_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/foot_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/foot_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/foot_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/hammer.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/hammer.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/hand_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/hand_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/hand_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/hand_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/leg_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/leg_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/leg_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/leg_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/dodarock/female/chest.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/dodarock/female/chest.vox
(Stored with Git LFS)
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user