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

Merge remote-tracking branch 'origin/master' into clientstates

Browse Source
This commit is contained in:
timokoesters 2020-02-03 22:02:32 +01:00
commit 0bc07a0835
951 changed files with 22036 additions and 8681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -4,3 +4,4 @@
*.wav filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.ico filter=lfs diff=lfs merge=lfs -text
assets/world/map/*.bin filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored
View File

@ -33,6 +33,7 @@
*.log
settings.ron
run.sh
maps
screenshots
todo.txt

13
.gitlab-ci.yml
View File

@ -16,6 +16,8 @@ before_script:
- free -h
- cargo --version
- export DISABLE_GIT_LFS_CHECK=true
- export VELOREN_ASSETS="$(pwd)/assets"
- echo "VELOREN_ASSETS=$VELOREN_ASSETS"
- rm -r target || echo "target doesnt exist, which is fine"
- ln -s /dockercache/veloren/target target
@ -32,7 +34,7 @@ before_script:
optional-release:linux:
<<: *optional-release
script:
- VELOREN_ASSETS=assets cargo build --verbose --release
- cargo build --verbose --release
- cp target/release/veloren-server-cli $CI_PROJECT_DIR
- cp target/release/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli
@ -48,7 +50,7 @@ optional-release:linux:
optional-release:windows:
<<: *optional-release
script:
- VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release
- cargo build --verbose --target=x86_64-pc-windows-gnu --release
- cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
artifacts:
@ -107,8 +109,6 @@ coverage:
tags:
- veloren-docker
script:
- sed -i '/cargo-features/d' Cargo.toml
- sed -i '/profile.dev.overrides/,+1d' Cargo.toml
- cargo tarpaulin -v
allow_failure: true
@ -119,6 +119,7 @@ benchmarks:
tags:
- veloren-docker
script:
- unset DISABLE_GIT_LFS_CHECK
- cargo bench
allow_failure: true
@ -134,7 +135,7 @@ linux:
tags:
- veloren-docker
script:
- VELOREN_ASSETS=assets cargo build --release
- cargo build --release
- cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli
@ -159,7 +160,7 @@ windows:
tags:
- veloren-docker
script:
- VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release
- cargo build --target=x86_64-pc-windows-gnu --release
- cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
artifacts:

18
.rustfmt.toml Normal file
View File

@ -0,0 +1,18 @@
hard_tabs = false
version = "Two"
format_code_in_doc_comments = true
format_strings = true
wrap_comments = true
#temporary disabled because of bug #461
#normalize_doc_attributes = true
use_try_shorthand = true
reorder_impl_items = true
fn_single_line = true
inline_attribute_width = 50
match_block_trailing_comma = true
merge_imports = true
overflow_delimited_expr = true
use_field_init_shorthand = true

52
CHANGELOG.md
View File

@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added music system
### Changed
### Removed
## [0.5.0] - 2019-01-31
### Added
- Added new debug item
- Bows give experience by projectiles having an owner
- Allow cancelling chunk generation
@ -28,10 +38,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added Scrolling Combat Text (SCT) & Settings for it
- Added a Death Screen and Hurt Screen
- Added randomly selected Loading Screen background images
- Added options to disable clouds and to use cheaper water rendering
- Added client-side character saving
- Added a localization system to provide multi-language support
to voxygen
- Added French language for Voxygen
- Added rivers and lakes which follow realistic physical paths.
- Added a sophisticated erosion system for world generation which
dramatically changes the world layout.
- Added tracking of sediment vs. bedrock, which is visually reflected in the
world.
- Added map saving and loading for altitude and bedrock, with built in
versioning for forwards compatibility.
- Added a default map, which is used to speed up starting single player.
- Added a 3D renderered map, which is also used by the server to send the map
to the client.
- Added fullscreen and window size to settings so that they can be persisted
- Added coverage based scaling for pixel art
- 28 new mobs
- Added waypoints
- Added pathfinding to NPCs
- Overhauled NPC AI
- Pets now attack enemies and defend their owners
- Added collars to tame wild animals
### Changed
- Controls pane in settings window now shows actual configured keys
- Fixed scroll wheel and roll keys on OS X
- Fixed near and far view planes
- Improvements to armor names
- Animation fixes to line up with true positions
@ -55,6 +89,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed not being able to unmount
- Fixed non-humanoids being able to climb and glide
- Made shadows and lights use interpolated positions
- Changed "Create Character" button position
- Made clouds bigger, more performant and prettier
- Terrain meshing optimized further
- Tree leaves no longer color blended
- Actual character stats displayed in character window
- Made significant changes to the noise functions used for world generation.
- Improved colors during world generation.
- Significantly reduced the use of warp during world generation.
- Parallelized and otherwise sped up significant parts of world generation.
- Various performance improvements to world generation.
- Nametags now a fixed size and shown in a limited range
- Non-humanoid skeletons now utilize configs for hotloading, and skeletal attributes.
- Names of NPCs spawned in the wild now include their species.
### Removed
@ -132,7 +179,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
_0.1.0 was part of the legacy engine_
[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.4.0&to=master
[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.5.0&to=master
[0.0.5]: https://gitlab.com/veloren/veloren/compare?from=v0.4.0&to=v0.5.0
[0.0.4]: https://gitlab.com/veloren/veloren/compare?from=v0.3.0&to=v0.4.0
[0.0.3]: https://gitlab.com/veloren/veloren/compare?from=v0.2.0&to=v0.3.0
[0.0.2]: https://gitlab.com/veloren/veloren/compare?from=7d17f8b67a2a6d5aa00730f028cedc430fd5075a&to=v0.2.0

134
Cargo.lock generated
View File

@ -604,7 +604,7 @@ dependencies = [
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
@ -642,6 +642,14 @@ dependencies = [
"crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "crossbeam-channel"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "crossbeam-deque"
version = "0.7.2"
@ -760,6 +768,11 @@ dependencies = [
"syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "deunicode"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "directories"
version = "2.0.2"
@ -942,16 +955,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "fsevent"
version = "0.4.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "fsevent-sys"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1337,6 +1350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1354,7 +1368,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1419,7 +1433,7 @@ dependencies = [
[[package]]
name = "inotify"
version = "0.7.0"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1467,7 +1481,7 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1788,18 +1802,17 @@ dependencies = [
[[package]]
name = "notify"
version = "5.0.0-pre.1"
version = "5.0.0-pre.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"inotify 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
"mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1981,6 +1994,14 @@ dependencies = [
"stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "packed_simd"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pango"
version = "0.4.0"
@ -2315,6 +2336,7 @@ dependencies = [
"rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2421,6 +2443,14 @@ dependencies = [
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rand_pcg"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rand_xorshift"
version = "0.1.1"
@ -2447,17 +2477,17 @@ dependencies = [
[[package]]
name = "rayon"
version = "1.2.1"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rayon-core"
version = "1.6.1"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2756,7 +2786,7 @@ dependencies = [
"arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"shred-derive 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2859,7 +2889,7 @@ dependencies = [
"hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
"shrev 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3149,17 +3179,17 @@ dependencies = [
[[package]]
name = "veloren-chat-cli"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-client 0.4.0",
"veloren-common 0.4.0",
"veloren-client 0.5.0",
"veloren-common 0.5.0",
]
[[package]]
name = "veloren-client"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3169,12 +3199,12 @@ dependencies = [
"specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-common 0.4.0",
"veloren-common 0.5.0",
]
[[package]]
name = "veloren-common"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3189,10 +3219,10 @@ dependencies = [
"lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
"mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"notify 5.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
"notify 5.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3205,7 +3235,7 @@ dependencies = [
[[package]]
name = "veloren-server"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3225,30 +3255,33 @@ dependencies = [
"specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
"uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-common 0.4.0",
"veloren-world 0.4.0",
"veloren-common 0.5.0",
"veloren-world 0.5.0",
]
[[package]]
name = "veloren-server-cli"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-common 0.4.0",
"veloren-server 0.4.0",
"veloren-common 0.5.0",
"veloren-server 0.5.0",
]
[[package]]
name = "veloren-voxygen"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
"conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
"cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"dispatch 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3276,34 +3309,41 @@ dependencies = [
"specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
"treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)",
"vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-client 0.4.0",
"veloren-common 0.4.0",
"veloren-server 0.4.0",
"veloren-client 0.5.0",
"veloren-common 0.5.0",
"veloren-server 0.5.0",
"veloren-world 0.5.0",
"winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "veloren-world"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"arr_macro 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)",
"noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"veloren-common 0.4.0",
"veloren-common 0.5.0",
]
[[package]]
@ -3639,6 +3679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2"
"checksum crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c"
"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
@ -3651,6 +3692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
"checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
"checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@ -3673,8 +3715,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
"checksum fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
"checksum fsevent 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1616e68919f49d311720c3cf316e0a3522d8f2bd08f8da35f6b8a0fa12f9234b"
"checksum fsevent-sys 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a41f1722e9bf862f62429d192f37d0c82c589aa18783aa06f0c4e5c3c90649fb"
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
@ -3719,7 +3761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8"
"checksum inotify 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc39ee997811267bf8aa0b10e1674c5bea6caacc1957eede5ea45251fe33c6d5"
"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
"checksum instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
@ -3763,7 +3805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
"checksum noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
"checksum notify 5.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d742ae493f34bd2e20ec2f3c1276fc1981343a8efd7ef12bca4368d0303bed50"
"checksum notify 5.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b00c0b65188bffb5598c302e19b062feb94adef02c31f15622a163c95d673c3"
"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
"checksum num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a"
@ -3783,6 +3825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
"checksum pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45374801e224373c3c0393cd48073c81093494c8735721e81d1dbaa4096b2767"
"checksum pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94039b3921a4af4058a3e4335e5d15099101f298a92f5afc40bab3a3027594a1"
"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
@ -3832,11 +3875,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
"checksum rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a"
"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
"checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
"checksum raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9db80d08d3ed847ce4fb3def46de0af4bfb6155bd09bd6eaf28b5ac72541c1f1"
"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"

31
Cargo.toml
View File

@ -22,28 +22,38 @@ codegen-units = 8
lto = false
incremental = true
# All dependencies (but not this crate itself)
[profile.dev.overrides."*"]
[profile.dev.package."*"]
opt-level = 3
[profile.dev.overrides."veloren-common"]
[profile.dev.package."veloren-common"]
opt-level = 2
[profile.dev.overrides."veloren-client"]
[profile.dev.package."veloren-client"]
opt-level = 2
[profile.dev.overrides."veloren-chat-cli"]
[profile.dev.package."veloren-chat-cli"]
opt-level = 2
[profile.dev.overrides."veloren-server"]
[profile.dev.package."veloren-server"]
opt-level = 2
[profile.dev.overrides."veloren-server-cli"]
[profile.dev.package."veloren-server-cli"]
opt-level = 2
[profile.dev.overrides."veloren-voxygen"]
[profile.dev.package."veloren-voxygen"]
opt-level = 2
[profile.dev.overrides."veloren-world"]
[profile.dev.package."veloren-world"]
opt-level = 2
[profile.no_overflow.package."veloren-world"]
opt-level = 3
# this profile is used by developers if dev doesn't has enough debug information, the name must != debug, as debug is used by dev because....
[profile.debuginfo]
inherits= 'dev'
debug = true
# used to perform things that do a *lot* of math (i.e. worldgen) but still need reasonable compilation time. Ideally this would also
# add -C target-cpu=native, but I don't think you can set this by profile currently.
[profile.no_overflow]
inherits= 'dev'
overflow-checks = false
debug-assertions = false
# this profile is used for veloren releases, compile time doesn't matter
# we need stacktraces, light debug information, as much checks as possible
# I would like to put it in a seperate `official_release` target, but that doesnt share caches with `cargo test` and `cargo bench`
@ -53,3 +63,8 @@ overflow-checks = false
debug-assertions = false
lto = true
debug = false
# this profile is used by developers for release profiling
[profile.releasedebuginfo]
inherits = 'release'
debug = 1

18
README.md
View File

@ -47,13 +47,13 @@ If you want to compile Veloren yourself, take a look at the [How to Compile Guid
#### Arch
[AUR Airshipper](https://aur.archlinux.org/packages/airshipper-git): `yay -Sy airshipper-git`
[AUR Airshipper](https://aur.archlinux.org/packages/airshipper-git): `yay -Syu airshipper-git`
[AUR latest binary release](https://aur.archlinux.org/packages/veloren-bin/): `yay -Sy veloren-bin`
[AUR latest binary release](https://aur.archlinux.org/packages/veloren-bin/): `yay -Syu veloren-bin`
[AUR latest release](https://aur.archlinux.org/packages/veloren/): `yay -Sy veloren`
[AUR latest release](https://aur.archlinux.org/packages/veloren/): `yay -Syu veloren`
[AUR latest master](https://aur.archlinux.org/packages/veloren-git): `yay -Sy veloren-git`
[AUR latest master](https://aur.archlinux.org/packages/veloren-git): `yay -Syu veloren-git`
## F.A.Q.
### **Q:** How is this game licensed?
@ -71,3 +71,13 @@ If you want to compile Veloren yourself, take a look at the [How to Compile Guid
## Credit
Many thanks to everyone that has contributed to Veloren's development, provided ideas, crafted art, composed music, hunted bugs, created tools and supported the project.
## Sponsorship
<a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=Veloren">
<img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg" width="201px">
</a>
We are extremely proud to be sponsored by [Digital Ocean](https://www.digitalocean.com).
Their support allows us to build and reliably power our shared backend services.

7
assets/common/items/collar.ron Normal file
View File

@ -0,0 +1,7 @@
Item(
name: "Collar",
description: "Tames wild animals within 5 blocks.",
kind: Utility(
kind: Collar,
),
)

786
assets/common/npc_names.json
View File

@ -1,313 +1,475 @@
{
"humanoid": [
"Adon",
"Agro",
"Arlo",
"Azamarr",
"Baashar",
"Barak",
"Barton",
"Baske",
"Baxar",
"Blaiz",
"Caelan",
"Cassian",
"Clawsen",
"Colborn",
"Dagfinn",
"Dagrod",
"Dimian",
"Domnhar",
"Ebraheim",
"Eldermar",
"Embre",
"Esdel",
"Eune",
"Fangar",
"Favroe",
"Feron",
"Feston",
"Fintis",
"Gatlen",
"Gatlin",
"Gentar",
"Gethrod",
"Graff",
"Gunnar",
"Hagalbar",
"Hawke",
"Hemm",
"Henndar",
"Hezra",
"Hodus",
"Ishmael",
"Jakrin",
"Jareth",
"Jaris",
"Jather",
"Jerrick",
"Jessop",
"Jinto",
"Joz",
"Kadric",
"Kagran",
"Kent",
"Khron",
"Kontas",
"Krinn",
"Lassrin",
"Lenox",
"Lothe",
"Lustros",
"Lydan",
"Mavrek",
"Moki",
"Monty",
"Nazim",
"Nesso",
"Ophni",
"Pakker",
"Paquin",
"Paskel",
"Pike",
"Ptorik",
"Quintis",
"Rankar",
"Renham",
"Revvyn",
"Riordan",
"Rivik",
"Rourke",
"Roux",
"Ryven",
"Sarkin",
"Sturp",
"Straus",
"Syrin",
"Talon",
"Tekren",
"Tez",
"Turrek",
"Tyvrik",
"Vadim",
"Vale",
"Varog",
"Verssek",
"Weston",
"Whit",
"Wulfe",
"Yorjan",
"Zaden",
"Zagaroth",
"Zenner"
],
"wolf": [
"Achak",
"Adalwolf",
"Akela",
"Alaska",
"Aleu",
"Amarok",
"Apisi",
"Archer",
"Ares",
"Arrax",
"Artic",
"Aspen",
"Aura",
"Axel",
"Balto",
"Barwolf",
"Basil",
"Beja",
"Beowulf",
"Borris",
"Brassa",
"Bruno",
"Chronos",
"Colt",
"Comet",
"Cronus",
"Czar",
"Dakota",
"Dash",
"Diego",
"Dire",
"Duke",
"Echo",
"Elda",
"Eskimo",
"Essos",
"Frey",
"Gabu",
"Ghost",
"Giro",
"Grey Wind",
"Gunner",
"Harou",
"Havoc",
"Hera",
"Hunter",
"Inuit",
"Jacob",
"Jenna",
"Juno",
"Kar",
"Khal",
"Kiba",
"Kimbra",
"Kodi",
"Lady",
"Lakota",
"Larka",
"Leah",
"Leto",
"Lobo",
"Loki",
"Lotus",
"Louve",
"Lupa",
"Major",
"Mathias",
"Moro",
"Murdock",
"Nomad",
"Okami",
"Orbit",
"Palla",
"Pyro",
"Radolf",
"Raven",
"Rhea",
"Rider",
"Rollo",
"Rune",
"Sable",
"Saga",
"Sarge",
"Shiro",
"Siku",
"Sky",
"Stark",
"Storm",
"Suki",
"Tala",
"Thor",
"Tiva",
"Tyr",
"Ubba",
"Ulva",
"Valor",
"Vechro",
"Wolf",
"Wolfgang",
"Yara",
"Zeus",
"Ziva",
"Zylo"
],
"pig": [
"Acorn",
"Adeline",
"Ajna",
"Athena",
"Avacado",
"Babe",
"Bella",
"Buddy",
"Buttons",
"Charlie",
"Charlotte",
"Chubbs",
"Cinnamon",
"Clarence",
"Clover",
"Cookie",
"Corky",
"Cupcake",
"Daisy",
"Dani",
"Delilah",
"Dexter",
"Dolly",
"Dottie",
"Dudley",
"Ellie",
"Erwin",
"Evie",
"Gertrude",
"Gilly",
"Ginger",
"Gizmo",
"Gwenivere",
"Hagrid",
"Hazel",
"Hector",
"Herman",
"Hermione",
"Hoover",
"Huck",
"Iggy",
"Jake",
"Josie",
"Leonardo",
"Lily",
"Lola",
"Lottie",
"Lucy",
"Lulu",
"Mabel",
"Madeline",
"Maisie",
"Millie",
"Mimzy",
"Nooch",
"Nutmeg",
"Oinkers",
"Okja",
"Oliver",
"Olivia",
"Panda",
"Pasley",
"Peanut",
"Penelope",
"Peppa",
"Petunia",
"Phoebe",
"Piggie Smalls",
"Piggles",
"Piglet",
"Pinto Bean",
"Piper",
"Poly",
"Popcorn",
"Poppy",
"Punky",
"Rey",
"Rooter",
"Rosie",
"Ruby",
"Sadie",
"Scouter",
"Skittles",
"Snowball",
"Snuffles",
"Sonny",
"Sprout",
"Squiggles",
"Sweetie Pie",
"Theo",
"Toffuti",
"Trixie",
"Violet",
"Vishnu",
"Wee Wee",
"Wilbur",
"Willow",
"Winnie",
"Wrinkles",
"Ziggy",
"Zoe",
"Zoinks"
]
}
"humanoid": {
"body": {
"keyword": "humanoid",
"names": [
"Adon",
"Agro",
"Arlo",
"Azamarr",
"Baashar",
"Barak",
"Barton",
"Baske",
"Baxar",
"Blaiz",
"Caelan",
"Cassian",
"Clawsen",
"Colborn",
"Dagfinn",
"Dagrod",
"Dimian",
"Domnhar",
"Ebraheim",
"Eldermar",
"Embre",
"Esdel",
"Eune",
"Fangar",
"Favroe",
"Feron",
"Feston",
"Fintis",
"Gatlen",
"Gatlin",
"Gentar",
"Gethrod",
"Graff",
"Gunnar",
"Hagalbar",
"Hawke",
"Hemm",
"Henndar",
"Hezra",
"Hodus",
"Ishmael",
"Jakrin",
"Jareth",
"Jaris",
"Jather",
"Jerrick",
"Jessop",
"Jinto",
"Joz",
"Kadric",
"Kagran",
"Kent",
"Khron",
"Kontas",
"Krinn",
"Lassrin",
"Lenox",
"Lothe",
"Lustros",
"Lydan",
"Mavrek",
"Moki",
"Monty",
"Nazim",
"Nesso",
"Ophni",
"Pakker",
"Paquin",
"Paskel",
"Pike",
"Ptorik",
"Quintis",
"Rankar",
"Renham",
"Revvyn",
"Riordan",
"Rivik",
"Rourke",
"Roux",
"Ryven",
"Sarkin",
"Sturp",
"Straus",
"Syrin",
"Talon",
"Tekren",
"Tez",
"Turrek",
"Tyvrik",
"Vadim",
"Vale",
"Varog",
"Verssek",
"Weston",
"Whit",
"Wulfe",
"Yorjan",
"Zaden",
"Zagaroth",
"Zenner"
]
},
"species": {
"danari": {
"generic": "Danari"
},
"dwarf": {
"generic": "Dwarf"
},
"elf": {
"generic": "Elf"
},
"human": {
"generic": "Human"
},
"orc": {
"generic": "Orc"
},
"undead": {
"generic": "Undead"
}
}
},
"quadruped_medium": {
"body": {
"keyword": "wolf",
"names": [
"Achak",
"Adalwolf",
"Akela",
"Alaska",
"Aleu",
"Amarok",
"Apisi",
"Archer",
"Ares",
"Arrax",
"Artic",
"Aspen",
"Aura",
"Axel",
"Balto",
"Barwolf",
"Basil",
"Beja",
"Beowulf",
"Borris",
"Brassa",
"Bruno",
"Chronos",
"Colt",
"Comet",
"Cronus",
"Czar",
"Dakota",
"Dash",
"Diego",
"Dire",
"Duke",
"Echo",
"Elda",
"Eskimo",
"Essos",
"Frey",
"Gabu",
"Ghost",
"Giro",
"Grey Wind",
"Gunner",
"Harou",
"Havoc",
"Hera",
"Hunter",
"Inuit",
"Jacob",
"Jenna",
"Juno",
"Kar",
"Khal",
"Kiba",
"Kimbra",
"Kodi",
"Lady",
"Lakota",
"Larka",
"Leah",
"Leto",
"Lobo",
"Loki",
"Lotus",
"Louve",
"Lupa",
"Major",
"Mathias",
"Moro",
"Murdock",
"Nomad",
"Okami",
"Orbit",
"Palla",
"Pyro",
"Radolf",
"Raven",
"Rhea",
"Rider",
"Rollo",
"Rune",
"Sable",
"Saga",
"Sarge",
"Shiro",
"Siku",
"Sky",
"Stark",
"Storm",
"Suki",
"Tala",
"Thor",
"Tiva",
"Tyr",
"Ubba",
"Ulva",
"Valor",
"Vechro",
"Wolf",
"Wolfgang",
"Yara",
"Zeus",
"Ziva",
"Zylo"
]
},
"species": {
"wolf": {
"generic": "Wolf"
},
"saber": {
"generic": "Sabertooth Tiger"
},
"viper": {
"generic": "Lizard"
},
"tuskram": {
"generic": "Tusk Ram"
},
"alligator": {
"generic": "Alligator"
},
"monitor": {
"generic": "Monitor Lizard"
},
"lion": {
"generic": "Lion"
},
"tarasque": {
"generic": "Tarasque"
}
}
},
"quadruped_small": {
"body": {
"keyword": "pig",
"names": [
"Acorn",
"Adeline",
"Ajna",
"Athena",
"Avacado",
"Babe",
"Bella",
"Buddy",
"Buttons",
"Charlie",
"Charlotte",
"Chubbs",
"Cinnamon",
"Clarence",
"Clover",
"Cookie",
"Corky",
"Cupcake",
"Daisy",
"Dani",
"Delilah",
"Dexter",
"Dolly",
"Dottie",
"Dudley",
"Ellie",
"Erwin",
"Evie",
"Gertrude",
"Gilly",
"Ginger",
"Gizmo",
"Gwenivere",
"Hogrid",
"Hazel",
"Hector",
"Herman",
"Hermione",
"Hoover",
"Huck",
"Iggy",
"Jake",
"Josie",
"Leonardo",
"Lily",
"Lola",
"Lottie",
"Lucy",
"Lulu",
"Mabel",
"Madeline",
"Maisie",
"Millie",
"Mimzy",
"Nooch",
"Nutmeg",
"Oinkers",
"Okja",
"Oliver",
"Olivia",
"Panda",
"Pasley",
"Peanut",
"Penelope",
"Peppa",
"Petunia",
"Phoebe",
"Piggie Smalls",
"Piggles",
"Piglet",
"Pinto Bean",
"Piper",
"Poly",
"Popcorn",
"Poppy",
"Punky",
"Rey",
"Rooter",
"Rosie",
"Ruby",
"Sadie",
"Scouter",
"Skittles",
"Snowball",
"Snuffles",
"Sonny",
"Sprout",
"Squiggles",
"Sweetie Pie",
"Theo",
"Toffuti",
"Trixie",
"Violet",
"Vishnu",
"Wee Wee",
"Wilbur",
"Willow",
"Winnie",
"Wrinkles",
"Ziggy",
"Zoe",
"Zoinks"
]
},
"species": {
"pig": {
"generic": "Pig"
},
"fox": {
"generic": "Fox"
},
"sheep": {
"generic": "Sheep"
},
"boar": {
"generic": "Boar"
},
"jackalope": {
"generic": "Jackalope"
},
"skunk": {
"generic": "Skunk"
},
"cat": {
"generic": "Cat"
},
"batfox": {
"generic": "Bat Fox"
},
"raccoon": {
"generic": "Raccoon"
},
"quokka": {
"generic": "Quokka"
},
"dodarock": {
"generic": "Dodarock"
},
"holladon": {
"generic": "Holladon"
}
}
},
"bird_medium": {
"body": {
"keyword": "duck",
"names": [
"Donald"
]
},
"species": {
"duck": {
"generic": "Duck"
},
"chicken": {
"generic": "Chicken"
},
"goose": {
"generic": "Goose"
},
"peacock": {
"generic": "Peacock"
}
}
},
"biped_large": {
"body": {
"keyword": "giant",
"names": [
"Leroy Brown"
]
},
"species": {
"giant": {
"generic": "Giant"
}
}
},
"critter": {
"body": {
"keyword": "rat",
"names": [
"Remy"
]
},
"species": {
"rat": {
"generic": "Rat"
},
"axolotl": {
"generic": "Axolotl"
},
"gecko": {
"generic": "Gecko"
},
"turtle": {
"generic": "Turtle"
},
"squirrel": {
"generic": "Squirrel"
},
"fungome": {
"generic": "Fungome"
}
}
}
}

BIN
assets/voxygen/audio/sfx/blank.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/chat_tell_received.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/inventory_add.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/weapon/bow.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/weapon/sword.wav (Stored with Git LFS)
View File

Binary file not shown.

46
assets/voxygen/audio/soundtrack.ron Normal file
View File

@ -0,0 +1,46 @@
(
tracks: [
(
title: "Field Grazing",
path: "voxygen.audio.soundtrack.field_grazing",
length: 154.0,
timing: Some(Day),
artist: "Aeronic",
),
(
title: "Wandering Voices",
path: "voxygen.audio.soundtrack.wandering_voices",
length: 137.0,
timing: Some(Night),
artist: "Aeronic",
),
(
title: "Snowtop Volume",
path: "voxygen.audio.soundtrack.snowtop_volume",
length: 89.0,
timing: Some(Day),
artist: "Aeronic",
),
(
title: "Mineral Deposits",
path: "voxygen.audio.soundtrack.mineral_deposits",
length: 148.0,
timing: Some(Day),
artist: "Aeronic",
),
(
title: "Moonbeams",
path: "voxygen.audio.soundtrack.moonbeams",
length: 158.0,
timing: Some(Night),
artist: "Aeronic",
),
(
title: "Serene Meadows",
path: "voxygen.audio.soundtrack.serene_meadows",
length: 173.0,
timing: Some(Night),
artist: "Aeronic",
)
]
)

BIN
assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/Ruination.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg (Stored with Git LFS)
View File

Binary file not shown.

0
assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg → assets/voxygen/audio/soundtrack/mineral_deposits.ogg
View File

BIN
assets/voxygen/audio/soundtrack/moonbeams.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/regional/grasslands.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/sacred_temple.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/serene_meadows.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
assets/voxygen/audio/soundtrack/Snowtop_volume.ogg → assets/voxygen/audio/soundtrack/snowtop_volume.ogg
View File

BIN
assets/voxygen/audio/soundtrack/wandering_voices.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_main.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/map.png (Stored with Git LFS)
View File

Binary file not shown.

0
assets/voxygen/element/misc_bg/test_char_l.png → assets/voxygen/element/0_1_knight.png
View File

BIN
assets/voxygen/element/buttons/arrow/chat_arrow.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/left.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/left_inactive.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/left_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/left_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/right.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/right_inactive.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/right_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/arrow/right_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/blue_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/blue_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark_hover.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark_red.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark_red_hover.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_dark_red_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_hover.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_login.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_login_hover.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_login_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/button_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/closed.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/closed_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/closed_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/open.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/open_mo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/frame/open_press.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/inv_slot.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/buttons/tab.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/bag.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/body_creation.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/char_creation.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/char_tab.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/inv_grid.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/menu.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/selection_hover.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/selection_press.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/skin_eyes.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/tab.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/frames/window_2.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/collar.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/skill_charge.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/skill_charge_2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/skill_charge_3.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/skill_slice_2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/staff_m2.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/bag_back.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/char_bg.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/char_tab.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/char_tab_bg.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/color_picker_blank.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/desc_bg.png (Stored with Git LFS)
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More