Merge branch 'zesterer-worldgen-stuff' into 'master'

Worldgen stuff See merge request veloren/veloren!217
2024-08-30 18:12:32 +00:00 · 2019-06-16 10:46:59 +00:00 · 2019-06-16 10:46:59 +00:00 · 132d1a67a6
commit 132d1a67a6
parent 8a490a6456 76344d142e
135 changed files with 1596 additions and 1108 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2676,6 +2676,7 @@ dependencies = [
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "minifb 0.11.2 (git+https://github.com/emoon/rust_minifb.git)",
 "noise 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "vek 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "veloren-common 0.2.0",
 ]
--- a/assets/world/tree/birch/1.vox
+++ b/assets/world/tree/birch/1.vox
--- a/assets/world/tree/birch/10.vox
+++ b/assets/world/tree/birch/10.vox
--- a/assets/world/tree/birch/11.vox
+++ b/assets/world/tree/birch/11.vox
--- a/assets/world/tree/birch/12.vox
+++ b/assets/world/tree/birch/12.vox
--- a/assets/world/tree/birch/2.vox
+++ b/assets/world/tree/birch/2.vox
--- a/assets/world/tree/birch/3.vox
+++ b/assets/world/tree/birch/3.vox
--- a/assets/world/tree/birch/4.vox
+++ b/assets/world/tree/birch/4.vox
--- a/assets/world/tree/birch/5.vox
+++ b/assets/world/tree/birch/5.vox
--- a/assets/world/tree/birch/6.vox
+++ b/assets/world/tree/birch/6.vox
--- a/assets/world/tree/birch/7.vox
+++ b/assets/world/tree/birch/7.vox
--- a/assets/world/tree/birch/8.vox
+++ b/assets/world/tree/birch/8.vox
--- a/assets/world/tree/birch/9.vox
+++ b/assets/world/tree/birch/9.vox
--- a/assets/world/tree/desert_palm/1.vox
+++ b/assets/world/tree/desert_palm/1.vox
--- a/assets/world/tree/desert_palm/10.vox
+++ b/assets/world/tree/desert_palm/10.vox
--- a/assets/world/tree/desert_palm/2.vox
+++ b/assets/world/tree/desert_palm/2.vox
--- a/assets/world/tree/desert_palm/3.vox
+++ b/assets/world/tree/desert_palm/3.vox
--- a/assets/world/tree/desert_palm/4.vox
+++ b/assets/world/tree/desert_palm/4.vox
--- a/assets/world/tree/desert_palm/5.vox
+++ b/assets/world/tree/desert_palm/5.vox
--- a/assets/world/tree/desert_palm/6.vox
+++ b/assets/world/tree/desert_palm/6.vox
--- a/assets/world/tree/desert_palm/7.vox
+++ b/assets/world/tree/desert_palm/7.vox
--- a/assets/world/tree/desert_palm/8.vox
+++ b/assets/world/tree/desert_palm/8.vox
--- a/assets/world/tree/desert_palm/9.vox
+++ b/assets/world/tree/desert_palm/9.vox
--- a/assets/world/tree/oak_green/1.vox
+++ b/assets/world/tree/oak_green/1.vox
--- a/assets/world/tree/oak_green/2.vox
+++ b/assets/world/tree/oak_green/2.vox
--- a/assets/world/tree/oak_green/3.vox
+++ b/assets/world/tree/oak_green/3.vox
--- a/assets/world/tree/oak_green/4.vox
+++ b/assets/world/tree/oak_green/4.vox
--- a/assets/world/tree/oak_green/5.vox
+++ b/assets/world/tree/oak_green/5.vox
--- a/assets/world/tree/oak_green/6.vox
+++ b/assets/world/tree/oak_green/6.vox
--- a/assets/world/tree/oak_green/7.vox
+++ b/assets/world/tree/oak_green/7.vox
--- a/assets/world/tree/oak_green/8.vox
+++ b/assets/world/tree/oak_green/8.vox
--- a/assets/world/tree/oak_green/9.vox
+++ b/assets/world/tree/oak_green/9.vox
--- a/assets/world/tree/oak_stump/1.vox
+++ b/assets/world/tree/oak_stump/1.vox
--- a/assets/world/tree/oak_stump/2.vox
+++ b/assets/world/tree/oak_stump/2.vox
--- a/assets/world/tree/oak_stump/3.vox
+++ b/assets/world/tree/oak_stump/3.vox
--- a/assets/world/tree/oak_stump/4.vox
+++ b/assets/world/tree/oak_stump/4.vox
--- a/assets/world/tree/oak_stump/5.vox
+++ b/assets/world/tree/oak_stump/5.vox
--- a/assets/world/tree/oak_stump/6.vox
+++ b/assets/world/tree/oak_stump/6.vox
--- a/assets/world/tree/oak_stump/7.vox
+++ b/assets/world/tree/oak_stump/7.vox
--- a/assets/world/tree/oak_stump/8.vox
+++ b/assets/world/tree/oak_stump/8.vox
--- a/assets/world/tree/oak_stump/9.vox
+++ b/assets/world/tree/oak_stump/9.vox
--- a/assets/world/tree/pine_blue/1.vox
+++ b/assets/world/tree/pine_blue/1.vox
--- a/assets/world/tree/pine_blue/2.vox
+++ b/assets/world/tree/pine_blue/2.vox
--- a/assets/world/tree/pine_blue/3.vox
+++ b/assets/world/tree/pine_blue/3.vox
--- a/assets/world/tree/pine_blue/4.vox
+++ b/assets/world/tree/pine_blue/4.vox
--- a/assets/world/tree/pine_blue/5.vox
+++ b/assets/world/tree/pine_blue/5.vox
--- a/assets/world/tree/pine_blue/6.vox
+++ b/assets/world/tree/pine_blue/6.vox
--- a/assets/world/tree/pine_blue/7.vox
+++ b/assets/world/tree/pine_blue/7.vox
--- a/assets/world/tree/pine_blue/8.vox
+++ b/assets/world/tree/pine_blue/8.vox
--- a/assets/world/tree/pine_green/1.vox
+++ b/assets/world/tree/pine_green/1.vox
--- a/assets/world/tree/pine_green/2.vox
+++ b/assets/world/tree/pine_green/2.vox
--- a/assets/world/tree/pine_green/3.vox
+++ b/assets/world/tree/pine_green/3.vox
--- a/assets/world/tree/pine_green/4.vox
+++ b/assets/world/tree/pine_green/4.vox
--- a/assets/world/tree/pine_green/5.vox
+++ b/assets/world/tree/pine_green/5.vox
--- a/assets/world/tree/pine_green/6.vox
+++ b/assets/world/tree/pine_green/6.vox
--- a/assets/world/tree/pine_green/7.vox
+++ b/assets/world/tree/pine_green/7.vox
--- a/assets/world/tree/pine_green/8.vox
+++ b/assets/world/tree/pine_green/8.vox
--- a/assets/world/tree/pine_green_2/1.vox
+++ b/assets/world/tree/pine_green_2/1.vox
--- a/assets/world/tree/pine_green_2/2.vox
+++ b/assets/world/tree/pine_green_2/2.vox
--- a/assets/world/tree/pine_green_2/3.vox
+++ b/assets/world/tree/pine_green_2/3.vox
--- a/assets/world/tree/pine_green_2/4.vox
+++ b/assets/world/tree/pine_green_2/4.vox
--- a/assets/world/tree/pine_green_2/5.vox
+++ b/assets/world/tree/pine_green_2/5.vox
--- a/assets/world/tree/pine_green_2/6.vox
+++ b/assets/world/tree/pine_green_2/6.vox
--- a/assets/world/tree/pine_green_2/7.vox
+++ b/assets/world/tree/pine_green_2/7.vox
--- a/assets/world/tree/pine_green_2/8.vox
+++ b/assets/world/tree/pine_green_2/8.vox
--- a/assets/world/tree/poplar/1.vox
+++ b/assets/world/tree/poplar/1.vox
--- a/assets/world/tree/poplar/10.vox
+++ b/assets/world/tree/poplar/10.vox
--- a/assets/world/tree/poplar/2.vox
+++ b/assets/world/tree/poplar/2.vox
--- a/assets/world/tree/poplar/3.vox
+++ b/assets/world/tree/poplar/3.vox
--- a/assets/world/tree/poplar/4.vox
+++ b/assets/world/tree/poplar/4.vox
--- a/assets/world/tree/poplar/5.vox
+++ b/assets/world/tree/poplar/5.vox
--- a/assets/world/tree/poplar/6.vox
+++ b/assets/world/tree/poplar/6.vox
--- a/assets/world/tree/poplar/7.vox
+++ b/assets/world/tree/poplar/7.vox
--- a/assets/world/tree/poplar/8.vox
+++ b/assets/world/tree/poplar/8.vox
--- a/assets/world/tree/poplar/9.vox
+++ b/assets/world/tree/poplar/9.vox
--- a/assets/world/tree/snow_birch/1.vox
+++ b/assets/world/tree/snow_birch/1.vox
--- a/assets/world/tree/snow_birch/10.vox
+++ b/assets/world/tree/snow_birch/10.vox
--- a/assets/world/tree/snow_birch/11.vox
+++ b/assets/world/tree/snow_birch/11.vox
--- a/assets/world/tree/snow_birch/12.vox
+++ b/assets/world/tree/snow_birch/12.vox
--- a/assets/world/tree/snow_birch/2.vox
+++ b/assets/world/tree/snow_birch/2.vox
--- a/assets/world/tree/snow_birch/3.vox
+++ b/assets/world/tree/snow_birch/3.vox
--- a/assets/world/tree/snow_birch/4.vox
+++ b/assets/world/tree/snow_birch/4.vox
--- a/assets/world/tree/snow_birch/5.vox
+++ b/assets/world/tree/snow_birch/5.vox
--- a/assets/world/tree/snow_birch/6.vox
+++ b/assets/world/tree/snow_birch/6.vox
--- a/assets/world/tree/snow_birch/7.vox
+++ b/assets/world/tree/snow_birch/7.vox
--- a/assets/world/tree/snow_birch/8.vox
+++ b/assets/world/tree/snow_birch/8.vox
--- a/assets/world/tree/snow_birch/9.vox
+++ b/assets/world/tree/snow_birch/9.vox
--- a/assets/world/tree/snow_pine/1.vox
+++ b/assets/world/tree/snow_pine/1.vox
--- a/assets/world/tree/snow_pine/2.vox
+++ b/assets/world/tree/snow_pine/2.vox
--- a/assets/world/tree/snow_pine/3.vox
+++ b/assets/world/tree/snow_pine/3.vox
--- a/assets/world/tree/snow_pine/4.vox
+++ b/assets/world/tree/snow_pine/4.vox
--- a/assets/world/tree/snow_pine/5.vox
+++ b/assets/world/tree/snow_pine/5.vox
--- a/assets/world/tree/snow_pine/6.vox
+++ b/assets/world/tree/snow_pine/6.vox
--- a/assets/world/tree/snow_pine/7.vox
+++ b/assets/world/tree/snow_pine/7.vox
--- a/assets/world/tree/snow_pine/8.vox
+++ b/assets/world/tree/snow_pine/8.vox
--- a/assets/world/tree/temperate_small/1.vox
+++ b/assets/world/tree/temperate_small/1.vox
--- a/assets/world/tree/temperate_small/2.vox
+++ b/assets/world/tree/temperate_small/2.vox
--- a/assets/world/tree/temperate_small/3.vox
+++ b/assets/world/tree/temperate_small/3.vox
--- a/assets/world/tree/temperate_small/4.vox
+++ b/assets/world/tree/temperate_small/4.vox
--- a/assets/world/tree/temperate_small/5.vox
+++ b/assets/world/tree/temperate_small/5.vox
--- a/Show More
+++ b/Show More