From 33e93ef25f26c1880566188580689f3bd629a391 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 25 Apr 2019 21:51:35 +0100
Subject: [PATCH 01/22] Added basic byte XOR checksum

Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
---
 Cargo.lock              | 38 +++++++++++++++++++-------------------
 client/src/lib.rs       |  4 ++--
 common/Cargo.toml       |  2 +-
 common/src/net/post2.rs | 27 ++++++++++++++++++++-------
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 323b04845d..6419e24a3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -296,7 +296,7 @@ name = "conrod_derive"
 version = "0.63.0"
 source = "git+https://gitlab.com/veloren/conrod.git#93f02e61838b475ff190b3563a0f41f8981cc228"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -511,7 +511,7 @@ name = "derivative"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -614,7 +614,7 @@ name = "euclid_macros"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -633,7 +633,7 @@ name = "failure_derive"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1034,7 +1034,7 @@ dependencies = [
  "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiff 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1341,10 +1341,10 @@ dependencies = [
 
 [[package]]
 name = "num-derive"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1591,7 +1591,7 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1612,7 +1612,7 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1628,7 +1628,7 @@ name = "quote"
 version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1969,7 +1969,7 @@ name = "serde_derive"
 version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2018,7 +2018,7 @@ name = "shred-derive"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2127,7 +2127,7 @@ name = "syn"
 version = "0.15.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2137,7 +2137,7 @@ name = "synstructure"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2195,7 +2195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2426,7 +2426,7 @@ name = "wayland-scanner"
 version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2703,7 +2703,7 @@ dependencies = [
 "checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
 "checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718"
 "checksum num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "107b9be86cd2481930688277b675b0114578227f034674726605b8a482d8baf8"
-"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d"
+"checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124"
 "checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
@@ -2732,9 +2732,9 @@ dependencies = [
 "checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
 "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 "checksum png 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925"
-"checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9"
+"checksum png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63daf481fdd0defa2d1d2be15c674fbfa1b0fd71882c303a91f9a79b3252c359"
 "checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
-"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)" = "ba92c84f814b3f9a44c5cfca7d2ad77fa10710867d2bbb1b3d175ab5f47daa12"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
 "checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 305cf38823..1534c162c1 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -204,8 +204,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 1..chunk_pos.x + 2 {
-                for j in chunk_pos.y - 1..chunk_pos.y + 2 {
+            for i in chunk_pos.x - 2..chunk_pos.x + 3 {
+                for j in chunk_pos.y - 2..chunk_pos.y + 3 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 7cbb23e2d8..3237dba90a 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -16,7 +16,7 @@ mio = "0.6"
 mio-extras = "2.0"
 serde = "1.0"
 serde_derive = "1.0"
-bincode = "1.0"
+bincode = "1.1"
 log = "0.4"
 rand = "0.5"
 rayon = "1.0"
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index fe1a0c5254..e861b010ed 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -196,7 +196,12 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                             let mut msg_bytes = bincode::serialize(&send_msg).unwrap();
 
                             // Assemble into packet
-                            let mut packet_bytes = msg_bytes.len().to_le_bytes().as_ref().to_vec();
+                            let mut packet_bytes = msg_bytes
+                                .len()
+                                .to_le_bytes()
+                                .as_ref()
+                                .to_vec();
+                            packet_bytes.push(msg_bytes.iter().fold(0, |a, x| a ^ *x));
                             packet_bytes.append(&mut msg_bytes);
 
                             // Split packet into chunks
@@ -256,20 +261,28 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
 
                 // Try turning bytes into messages
                 for _ in 0..100 {
-                    match incoming_buf.get(0..8) {
+                    match incoming_buf.get(0..9) {
                         Some(len_bytes) => {
-                            let len = usize::from_le_bytes(<[u8; 8]>::try_from(len_bytes).unwrap()); // Can't fail
+                            let len = usize::from_le_bytes(<[u8; 8]>::try_from(&len_bytes[0..8]).unwrap()); // Can't fail
 
                             if len > MAX_MSG_SIZE {
                                 recv_tx.send(Err(Error::InvalidMessage)).unwrap();
                                 break 'work;
-                            } else if incoming_buf.len() >= len + 8 {
-                                match bincode::deserialize(&incoming_buf[8..len + 8]) {
+                            } else if incoming_buf.len() >= len + 9 {
+                                let checksum_found = incoming_buf[9..len + 9].iter().fold(0, |a, x| a ^ *x);
+                                let checksum_expected = len_bytes[8];
+
+                                assert_eq!(checksum_found, checksum_expected, "Message checksum failed!");
+
+                                match bincode::deserialize(&incoming_buf[9..len + 9]) {
                                     Ok(msg) => recv_tx.send(Ok(msg)).unwrap(),
-                                    Err(err) => recv_tx.send(Err(err.into())).unwrap(),
+                                    Err(err) => {
+                                        println!("BINCODE ERROR: {:?}", err);
+                                        recv_tx.send(Err(err.into())).unwrap()
+                                    },
                                 }
 
-                                incoming_buf = incoming_buf.split_off(len + 8);
+                                incoming_buf = incoming_buf.split_off(len + 9);
                             } else {
                                 break;
                             }

From bdf0e92e45812e9ad9add7c878834c0f83dff90f Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Sat, 27 Apr 2019 16:47:56 +0100
Subject: [PATCH 02/22] HAAAAAAAANDS

Former-commit-id: 88927242c21471888a00799110b6bc542e9e18a2
---
 client/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 1534c162c1..305cf38823 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -204,8 +204,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 2..chunk_pos.x + 3 {
-                for j in chunk_pos.y - 2..chunk_pos.y + 3 {
+            for i in chunk_pos.x - 1..chunk_pos.x + 2 {
+                for j in chunk_pos.y - 1..chunk_pos.y + 2 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()

From b8418c116f7d50e898366cf3d147101952d9a211 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 30 Apr 2019 10:42:05 +0100
Subject: [PATCH 03/22] Smaller worldgen range

Former-commit-id: 4c156376b5a835dadd5709b91a38ec8e00ab72fd
---
 client/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 305cf38823..9df0e535fc 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -204,8 +204,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 1..chunk_pos.x + 2 {
-                for j in chunk_pos.y - 1..chunk_pos.y + 2 {
+            for i in chunk_pos.x - 0..chunk_pos.x + 1 {
+                for j in chunk_pos.y - 0..chunk_pos.y + 1 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()

From 3cd48ba4681c9c2a9ff80ff1439c4676f10922d0 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 May 2019 10:22:48 +0100
Subject: [PATCH 04/22] Added lz4 compression to networking

Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
---
 Cargo.lock              |  17 ++
 client/Cargo.lock       | 586 ++++++++++++++++++++++++++++++++++++++++
 client/src/lib.rs       |   6 +-
 common/Cargo.toml       |   1 +
 common/src/net/post2.rs |   7 +-
 common/src/sys/phys.rs  |   2 +-
 server/src/lib.rs       |   2 +-
 7 files changed, 614 insertions(+), 7 deletions(-)
 create mode 100644 client/Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index 6419e24a3b..a4a7395b05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -162,6 +162,11 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byteorder"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.3.1"
@@ -1170,6 +1175,15 @@ dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "lz4-compress"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lzw"
 version = "0.10.0"
@@ -2288,6 +2302,7 @@ dependencies = [
  "image 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2576,6 +2591,7 @@ dependencies = [
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
 "checksum c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6237ac5a4b1e81c213c24c6437964c61e646df910a914b4ab1487b46df20bd13"
 "checksum cairo-rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0180a8b65dc13e78479c6a47c4d5f094d64dc34465a9433c6daef9ae2fbfb3ee"
@@ -2684,6 +2700,7 @@ dependencies = [
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f966533a922a9bba9e95e594c1fdb3b9bf5fdcdb11e37e51ad84cd76e468b91"
 "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
 "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
diff --git a/client/Cargo.lock b/client/Cargo.lock
new file mode 100644
index 0000000000..9a47c24bc9
--- /dev/null
+++ b/client/Cargo.lock
@@ -0,0 +1,586 @@
+[[package]]
+name = "arrayvec"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atom"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "byteorder"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "derivative"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "either"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fnv"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hibitset"
+version = "0.5.3"
+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.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lock_api"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "mopa"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "nodrop"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "nonzero_signed"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num_cpus"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "owning_ref"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "owning_ref"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rayon"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "shred"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "shred-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "shrev"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "smallvec"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "specs"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hibitset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nonzero_signed 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shred 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shred-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "0.15.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tuple_utils"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "veloren-client"
+version = "0.1.0"
+dependencies = [
+ "specs 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
+"checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum crossbeam 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7408247b1b87f480890f28b670c5f8d9a8a4274833433fe74dc0dfd46d33650"
+"checksum crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b85741761b7f160bc5e7e0c14986ef685b7f8bf9b7ad081c60c604bb4649827"
+"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
+"checksum crossbeam-deque 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7792c4a9b5a4222f654e3728a3dd945aacc24d2c3a1a096ed265d80e4929cb9a"
+"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
+"checksum crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30fecfcac6abfef8771151f8be4abc9e4edc112c2bcb233314cafde2680536e9"
+"checksum crossbeam-epoch 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8"
+"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
+"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
+"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898"
+"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"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"
+"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+"checksum hibitset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a795da5d89ae959c6765f92de69d0f1642134a80f0898f0ab231f7d67ffc5749"
+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
+"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915"
+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nonzero_signed 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d9813c459ba38abf9c40eecc8d59738eb7ebcfc45a857030967372dcb83e18de"
+"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
+"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
+"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
+"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
+"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
+"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
+"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
+"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
+"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
+"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
+"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
+"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"
+"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum shred 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c75ec29e8d2959ad96a1087fe4cadb926c6fc17cbae9812314fa8efe720aa2a"
+"checksum shred-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fcf34e5e5302d3024aba7afc291f6d1ca7573ed035d3c0796976ba3f10691a1"
+"checksum shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec60ed6f60a4b3cdc2ceacf57215db3408fbd8990f66a38686a31558cd9da482"
+"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum specs 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06df46b79dafa300305d7bddb756557d44385e5f8b311fa640bbfa2c748a358"
+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
+"checksum tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbfecd7bb8f0a3e96b3b31c46af2677a55a588767c0091f484601424fcb20e7e"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 9df0e535fc..392aa4c3d7 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -195,7 +195,7 @@ impl Client {
             // Remove chunks that are too far from the player
             let mut chunks_to_remove = Vec::new();
             self.state.terrain().iter().for_each(|(key, _)| {
-                if (chunk_pos - key).map(|e| e.abs()).reduce_max() > 3 {
+                if (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max() > 3 {
                     chunks_to_remove.push(key);
                 }
             });
@@ -204,8 +204,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 0..chunk_pos.x + 1 {
-                for j in chunk_pos.y - 0..chunk_pos.y + 1 {
+            for i in chunk_pos.x - 2..chunk_pos.x + 3 {
+                for j in chunk_pos.y - 2..chunk_pos.y + 3 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 3237dba90a..750eaa4975 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -21,3 +21,4 @@ log = "0.4"
 rand = "0.5"
 rayon = "1.0"
 lazy_static = "1.3"
+lz4-compress = "0.1"
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index e861b010ed..88de025d57 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -193,7 +193,8 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                     match send_rx.try_recv() {
                         Ok(send_msg) => {
                             // Serialize message
-                            let mut msg_bytes = bincode::serialize(&send_msg).unwrap();
+                            let msg_bytes = bincode::serialize(&send_msg).unwrap();
+                            let mut msg_bytes = lz4_compress::compress(&msg_bytes);
 
                             // Assemble into packet
                             let mut packet_bytes = msg_bytes
@@ -274,7 +275,9 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
 
                                 assert_eq!(checksum_found, checksum_expected, "Message checksum failed!");
 
-                                match bincode::deserialize(&incoming_buf[9..len + 9]) {
+                                let msg_bytes = lz4_compress::decompress(&incoming_buf[9..len + 9]).unwrap();
+
+                                match bincode::deserialize(&msg_bytes) {
                                     Ok(msg) => recv_tx.send(Ok(msg)).unwrap(),
                                     Err(err) => {
                                         println!("BINCODE ERROR: {:?}", err);
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index 32ba34b896..8e3bd1da3b 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -23,7 +23,7 @@ impl<'a> System<'a> for Sys {
     fn run(&mut self, (terrain, dt, mut positions, mut velocities): Self::SystemData) {
         for (pos, vel) in (&mut positions, &mut velocities).join() {
             // Gravity
-            vel.0.z -= GRAVITY * dt.0 as f32;
+            vel.0.z = (vel.0.z - GRAVITY * dt.0 as f32).max(-50.0);
 
             // Movement
             pos.0 += vel.0 * dt.0 as f32;
diff --git a/server/src/lib.rs b/server/src/lib.rs
index f25d62c468..f0b93fbc6d 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -191,7 +191,7 @@ impl Server {
                 .join()
             {
                 let chunk_pos = self.state.terrain().pos_key(pos.0.map(|e| e as i32));
-                let dist = (chunk_pos - key).map(|e| e.abs()).reduce_max();
+                let dist = (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max();
 
                 if dist < 4 {
                     self.clients.notify(

From 342ea6aa659bd8d6e5c9d46d94bd4841e29632a3 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 May 2019 12:01:50 +0100
Subject: [PATCH 05/22] Significantly upped view distances

Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
---
 client/src/lib.rs       | 6 +++---
 common/src/net/post2.rs | 4 ++++
 server/src/lib.rs       | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 392aa4c3d7..800807bade 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -195,7 +195,7 @@ impl Client {
             // Remove chunks that are too far from the player
             let mut chunks_to_remove = Vec::new();
             self.state.terrain().iter().for_each(|(key, _)| {
-                if (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max() > 3 {
+                if (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max() > 6 {
                     chunks_to_remove.push(key);
                 }
             });
@@ -204,8 +204,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 2..chunk_pos.x + 3 {
-                for j in chunk_pos.y - 2..chunk_pos.y + 3 {
+            for i in chunk_pos.x - 4..chunk_pos.x + 5 {
+                for j in chunk_pos.y - 4..chunk_pos.y + 5 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index 88de025d57..f7e1ca561e 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -196,6 +196,10 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                             let msg_bytes = bincode::serialize(&send_msg).unwrap();
                             let mut msg_bytes = lz4_compress::compress(&msg_bytes);
 
+                            if msg_bytes.len() > 512 {
+                                println!("MSG SIZE: {}", msg_bytes.len());
+                            }
+
                             // Assemble into packet
                             let mut packet_bytes = msg_bytes
                                 .len()
diff --git a/server/src/lib.rs b/server/src/lib.rs
index f0b93fbc6d..c9196c8e9c 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -193,7 +193,7 @@ impl Server {
                 let chunk_pos = self.state.terrain().pos_key(pos.0.map(|e| e as i32));
                 let dist = (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max();
 
-                if dist < 4 {
+                if dist < 5 {
                     self.clients.notify(
                         entity,
                         ServerMsg::TerrainChunkUpdate {
@@ -225,7 +225,7 @@ impl Server {
                 min_dist = min_dist.min(dist);
             }
 
-            if min_dist > 3 {
+            if min_dist > 6 {
                 chunks_to_remove.push(key);
             }
         });

From 9ebe3c3e6fe734b7b5397db890e2ad18d263ddad Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 May 2019 12:28:26 +0100
Subject: [PATCH 06/22] Added a delta time cap to avoid missing important
 physics events

Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
---
 common/src/state.rs    | 14 +++++++++++---
 common/src/sys/phys.rs |  4 ++--
 world/src/lib.rs       | 10 +++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/common/src/state.rs b/common/src/state.rs
index 447c9117e4..82b28adfcf 100644
--- a/common/src/state.rs
+++ b/common/src/state.rs
@@ -30,7 +30,13 @@ struct Time(f64);
 
 /// A resource used to store the time since the last tick
 #[derive(Default)]
-pub struct DeltaTime(pub f64);
+pub struct DeltaTime(pub f32);
+
+/// At what point should we stop speeding up physics to compensate for lag? If we speed physics up
+/// too fast, we'd skip important physics events like collisions. This constant determines what
+/// the upper limit is. If delta time exceeds this value, the game's physics will begin to produce
+/// time lag. Ideally, we'd avoid such a situation.
+const MAX_DELTA_TIME: f32 = 0.2;
 
 pub struct Changes {
     pub new_chunks: HashSet<Vec3<i32>>,
@@ -198,9 +204,11 @@ impl State {
         self.ecs.write_resource::<TimeOfDay>().0 += dt.as_secs_f64() * DAY_CYCLE_FACTOR;
         self.ecs.write_resource::<Time>().0 += dt.as_secs_f64();
 
-        // Run systems to update the world
-        self.ecs.write_resource::<DeltaTime>().0 = dt.as_secs_f64();
+        // Update delta time
+        // Above a delta time of MAX_DELTA_TIME, start lagging to avoid skipping important physics events
+        self.ecs.write_resource::<DeltaTime>().0 = dt.as_secs_f32().min(MAX_DELTA_TIME);
 
+        // Run systems to update the world
         // Create and run dispatcher for ecs systems
         let mut dispatch_builder = DispatcherBuilder::new().with_pool(self.thread_pool.clone());
         sys::add_local_systems(&mut dispatch_builder);
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index 8e3bd1da3b..b876f9b6d1 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -23,10 +23,10 @@ impl<'a> System<'a> for Sys {
     fn run(&mut self, (terrain, dt, mut positions, mut velocities): Self::SystemData) {
         for (pos, vel) in (&mut positions, &mut velocities).join() {
             // Gravity
-            vel.0.z = (vel.0.z - GRAVITY * dt.0 as f32).max(-50.0);
+            vel.0.z = (vel.0.z - GRAVITY * dt.0).max(-50.0);
 
             // Movement
-            pos.0 += vel.0 * dt.0 as f32;
+            pos.0 += vel.0 * dt.0;
 
             // Basic collision with terrain
             let mut i = 0;
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 7a29dc2f2f..758d740d3e 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -1,5 +1,5 @@
 // Library
-use noise::{NoiseFn, Perlin};
+use noise::{NoiseFn, Perlin, Seedable};
 use vek::*;
 
 // Project
@@ -32,7 +32,10 @@ impl World {
         let dirt = Block::new(3, Rgb::new(128, 90, 0));
         let sand = Block::new(4, Rgb::new(180, 150, 50));
 
-        let perlin_nz = Perlin::new();
+        let perlin_nz = Perlin::new()
+            .set_seed(1);
+        let temp_nz = Perlin::new()
+            .set_seed(2);
 
         for lpos in chunk.iter_positions() {
             let wpos = lpos + chunk_pos * chunk.get_size().map(|e| e as i32);
@@ -46,6 +49,7 @@ impl World {
             let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl
                 + perlin_nz.get(Vec2::from(wposf * small_freq).into_array()) * small_ampl
                 + offs;
+            let temp = (temp_nz.get(Vec2::from(wposf * (1.0 / 64.0)).into_array()) + 1.0) * 0.5;
 
             chunk
                 .set(
@@ -55,7 +59,7 @@ impl World {
                     } else if wposf.z < height - 1.0 {
                         dirt
                     } else if wposf.z < height {
-                        grass
+                        Block::new(2, Rgb::new(10 + (150.0 * temp) as u8, 150, 0))
                     } else {
                         air
                     },

From 5aa8a678005d0e302998860b4a4c8c4c61a7b017 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 May 2019 16:51:25 +0100
Subject: [PATCH 07/22] Added jump button

Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307
---
 voxygen/src/settings.rs | 2 ++
 voxygen/src/window.rs   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index e911498c76..5a22ee9936 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -24,6 +24,7 @@ pub struct ControlSettings {
     pub move_left: VirtualKeyCode,
     pub move_back: VirtualKeyCode,
     pub move_right: VirtualKeyCode,
+    pub jump: VirtualKeyCode,
     pub map: VirtualKeyCode,
     pub bag: VirtualKeyCode,
     pub quest_log: VirtualKeyCode,
@@ -58,6 +59,7 @@ impl Default for Settings {
                 move_left: VirtualKeyCode::A,
                 move_back: VirtualKeyCode::S,
                 move_right: VirtualKeyCode::D,
+                jump: VirtualKeyCode::Space,
                 map: VirtualKeyCode::M,
                 bag: VirtualKeyCode::B,
                 quest_log: VirtualKeyCode::L,
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 824b679d0b..ad33f2d9ce 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -45,6 +45,7 @@ impl Window {
         key_map.insert(settings.controls.move_left, Key::MoveLeft);
         key_map.insert(settings.controls.move_back, Key::MoveBack);
         key_map.insert(settings.controls.move_right, Key::MoveRight);
+        key_map.insert(settings.controls.jump, Key::Jump);
         key_map.insert(settings.controls.map, Key::Map);
         key_map.insert(settings.controls.bag, Key::Bag);
         key_map.insert(settings.controls.quest_log, Key::QuestLog);
@@ -180,6 +181,7 @@ pub enum Key {
     MoveBack,
     MoveLeft,
     MoveRight,
+    Jump,
     Enter,
     Escape,
     Map,

From e6a40bbda2e22cfc6d5022705d7b16c56aeec6b4 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 May 2019 17:55:29 +0100
Subject: [PATCH 08/22] Added jumping and Jump animation state

Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
---
 client/src/input.rs          |  9 +++++-
 client/src/lib.rs            |  3 +-
 common/src/comp/agent.rs     |  2 ++
 common/src/comp/character.rs |  1 +
 common/src/sys/control.rs    | 53 ++++++++++++++++++++++++++----------
 common/src/sys/phys.rs       |  2 +-
 voxygen/src/key_state.rs     |  4 ---
 voxygen/src/scene/figure.rs  |  9 ++++--
 voxygen/src/session.rs       | 35 ++++++++++++++++++++----
 9 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/client/src/input.rs b/client/src/input.rs
index c30a12bbb9..840ee46525 100644
--- a/client/src/input.rs
+++ b/client/src/input.rs
@@ -1,14 +1,21 @@
 use vek::*;
 
+pub enum InputEvent {
+    Jump,
+}
+
 pub struct Input {
-    // TODO: Use this type to manage client input
     pub move_dir: Vec2<f32>,
+    pub jumping: bool,
+    pub events: Vec<InputEvent>,
 }
 
 impl Default for Input {
     fn default() -> Self {
         Input {
             move_dir: Vec2::zero(),
+            jumping: false,
+            events: Vec::new(),
         }
     }
 }
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 800807bade..6619facfeb 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -4,7 +4,7 @@ pub mod error;
 pub mod input;
 
 // Reexports
-pub use crate::{error::Error, input::Input};
+pub use crate::{error::Error, input::{Input, InputEvent}};
 pub use specs::join::Join;
 pub use specs::Entity as EcsEntity;
 
@@ -152,6 +152,7 @@ impl Client {
             self.entity,
             comp::Control {
                 move_dir: input.move_dir,
+                jumping: input.jumping,
             },
         );
 
diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs
index 4617e78f3c..1c299b8ba3 100644
--- a/common/src/comp/agent.rs
+++ b/common/src/comp/agent.rs
@@ -13,12 +13,14 @@ impl Component for Agent {
 #[derive(Copy, Clone, Debug, Serialize, Deserialize)]
 pub struct Control {
     pub move_dir: Vec2<f32>,
+    pub jumping: bool,
 }
 
 impl Default for Control {
     fn default() -> Self {
         Self {
             move_dir: Vec2::zero(),
+            jumping: false,
         }
     }
 }
diff --git a/common/src/comp/character.rs b/common/src/comp/character.rs
index 3ea3f58b64..a9e145bc45 100644
--- a/common/src/comp/character.rs
+++ b/common/src/comp/character.rs
@@ -119,6 +119,7 @@ pub struct AnimationHistory {
 pub enum Animation {
     Idle,
     Run,
+    Jump,
 }
 
 impl Component for Character {
diff --git a/common/src/sys/control.rs b/common/src/sys/control.rs
index 805336b939..78fd2d2866 100644
--- a/common/src/sys/control.rs
+++ b/common/src/sys/control.rs
@@ -1,11 +1,15 @@
 // Library
-use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
+use specs::{Entities, Join, Read, ReadStorage, ReadExpect, System, WriteStorage};
 use vek::*;
 
 // Crate
-use crate::comp::{
-    phys::{Dir, Pos, Vel},
-    Animation, AnimationHistory, Control,
+use crate::{
+    comp::{
+        phys::{Dir, Pos, Vel},
+        Animation, AnimationHistory, Control,
+    },
+    terrain::TerrainMap,
+    vol::{ReadVol, Vox},
 };
 
 // Basic ECS AI agent system
@@ -13,26 +17,47 @@ pub struct Sys;
 
 impl<'a> System<'a> for Sys {
     type SystemData = (
+        ReadExpect<'a, TerrainMap>,
         Entities<'a>,
+        ReadStorage<'a, Pos>,
         WriteStorage<'a, Vel>,
         WriteStorage<'a, Dir>,
         WriteStorage<'a, AnimationHistory>,
         ReadStorage<'a, Control>,
     );
 
-    fn run(&mut self, (entities, mut vels, mut dirs, mut anims, controls): Self::SystemData) {
-        for (entity, mut vel, mut dir, control) in
-            (&entities, &mut vels, &mut dirs, &controls).join()
+    fn run(&mut self, (terrain, entities, pos, mut vels, mut dirs, mut anims, controls): Self::SystemData) {
+        for (entity, pos, mut vel, mut dir, control) in
+            (&entities, &pos, &mut vels, &mut dirs, &controls).join()
         {
-            // TODO: Don't hard-code this
-            // Apply physics to the player: acceleration and non-linear decceleration
-            vel.0 += control.move_dir * 2.0 - vel.0.map(|e| e * e.abs() + e) * 0.03;
+            let on_ground = terrain
+                .get((pos.0 - Vec3::unit_z() * 0.1).map(|e| e.floor() as i32))
+                .map(|vox| !vox.is_empty())
+                .unwrap_or(false) && vel.0.z <= 0.0;
 
-            let animation = if control.move_dir.magnitude() > 0.01 {
-                dir.0 = vel.0.normalized() * Vec3::new(1.0, 1.0, 0.0);
-                Animation::Run
+            if on_ground {
+                // TODO: Don't hard-code this
+                // Apply physics to the player: acceleration and non-linear decceleration
+                vel.0 += control.move_dir * 2.0 - vel.0.map(|e| e * e.abs() + e) * 0.03;
+
+                if control.jumping {
+                    vel.0.z += 16.0;
+                }
             } else {
-                Animation::Idle
+                // TODO: Don't hard-code this
+                // Apply physics to the player: acceleration and non-linear decceleration
+                vel.0 += control.move_dir * 0.2;
+            }
+
+            let animation = if on_ground {
+                if control.move_dir.magnitude() > 0.01 {
+                    dir.0 = vel.0.normalized() * Vec3::new(1.0, 1.0, 0.0);
+                    Animation::Run
+                } else {
+                    Animation::Idle
+                }
+            } else {
+                Animation::Jump
             };
 
             let last_animation = anims.get_mut(entity).map(|h| h.current);
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index b876f9b6d1..377b7c59b9 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -10,7 +10,7 @@ use vek::*;
 // Basic ECS physics system
 pub struct Sys;
 
-const GRAVITY: f32 = 9.81 * 2.0;
+const GRAVITY: f32 = 9.81 * 4.0;
 
 impl<'a> System<'a> for Sys {
     type SystemData = (
diff --git a/voxygen/src/key_state.rs b/voxygen/src/key_state.rs
index c25bb4dd7b..3e97fe7d4a 100644
--- a/voxygen/src/key_state.rs
+++ b/voxygen/src/key_state.rs
@@ -25,8 +25,4 @@ impl KeyState {
             if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
         )
     }
-
-    pub fn jump(&self) -> bool {
-        self.jump
-    }
 }
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index af37bb5388..a2d6cbb7aa 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -208,10 +208,15 @@ impl FigureCache {
             let target_skeleton = match animation_history.current {
                 comp::character::Animation::Idle => {
                     IdleAnimation::update_skeleton(&mut state.skeleton, time)
-                }
+                },
                 comp::character::Animation::Run => {
                     RunAnimation::update_skeleton(&mut state.skeleton, time)
-                }
+                },
+                comp::character::Animation::Jump => {
+                    // TODO
+                    // JumpAnimation::update_skeleton(&mut state.skeleton, time)
+                    state.skeleton.clone()
+                },
             };
 
             state.skeleton.interpolate(&target_skeleton);
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index d1b9de0361..9a93f05c91 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -1,3 +1,17 @@
+use std::{
+    cell::RefCell,
+    rc::Rc,
+    time::Duration,
+    mem,
+};
+use vek::*;
+use common::clock::Clock;
+use client::{
+    self,
+    Client,
+    Input,
+    InputEvent,
+};
 use crate::{
     hud::{Event as HudEvent, Hud},
     key_state::KeyState,
@@ -7,10 +21,6 @@ use crate::{
     window::{Event, Key, Window},
     Direction, Error, GlobalState, PlayState, PlayStateResult,
 };
-use client::{self, Client};
-use common::clock::Clock;
-use std::{cell::RefCell, rc::Rc, time::Duration};
-use vek::*;
 
 const FPS: u64 = 60;
 
@@ -18,6 +28,7 @@ pub struct SessionState {
     scene: Scene,
     client: Rc<RefCell<Client>>,
     key_state: KeyState,
+    input_events: Vec<InputEvent>,
     hud: Hud,
 }
 
@@ -32,6 +43,7 @@ impl SessionState {
             client,
             key_state: KeyState::new(),
             hud: Hud::new(window, settings),
+            input_events: Vec::new(),
         }
     }
 }
@@ -56,10 +68,18 @@ impl SessionState {
         let dir_vec = self.key_state.dir_vec();
         let move_dir = unit_vecs.0 * dir_vec[0] + unit_vecs.1 * dir_vec[1];
 
+        // Take the input events
+        let mut input_events = Vec::new();
+        mem::swap(&mut self.input_events, &mut input_events);
+
         for event in self
             .client
             .borrow_mut()
-            .tick(client::Input { move_dir }, dt)?
+            .tick(Input {
+                move_dir,
+                jumping: self.key_state.jump,
+                events: input_events,
+            }, dt)?
         {
             match event {
                 client::Event::Chat(msg) => {
@@ -132,11 +152,16 @@ impl PlayState for SessionState {
                     Event::KeyDown(Key::MoveBack) => self.key_state.down = true,
                     Event::KeyDown(Key::MoveLeft) => self.key_state.left = true,
                     Event::KeyDown(Key::MoveRight) => self.key_state.right = true,
+                    Event::KeyDown(Key::Jump) => {
+                        self.input_events.push(InputEvent::Jump);
+                        self.key_state.jump = true;
+                    },
                     // Movement Key Released
                     Event::KeyUp(Key::MoveForward) => self.key_state.up = false,
                     Event::KeyUp(Key::MoveBack) => self.key_state.down = false,
                     Event::KeyUp(Key::MoveLeft) => self.key_state.left = false,
                     Event::KeyUp(Key::MoveRight) => self.key_state.right = false,
+                    Event::KeyUp(Key::Jump) => self.key_state.jump = false,
                     // Pass all other events to the scene
                     event => {
                         self.scene.handle_input_event(event);

From 2e3288cc29ec5d8e78756f1797312d653b841be1 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 6 May 2019 13:11:03 +0100
Subject: [PATCH 09/22] Adjusted view distance and worldgen

Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
---
 assets/voxygen/font/LICENSE.txt             | 202 --------------------
 assets/voxygen/font/OFL.txt                 |  94 ---------
 client/src/lib.rs                           |   4 +-
 server/src/lib.rs                           |   4 +-
 voxygen/src/menu/main/start_singleplayer.rs |   2 +-
 world/src/lib.rs                            |  10 +-
 6 files changed, 13 insertions(+), 303 deletions(-)
 delete mode 100644 assets/voxygen/font/LICENSE.txt
 delete mode 100644 assets/voxygen/font/OFL.txt

diff --git a/assets/voxygen/font/LICENSE.txt b/assets/voxygen/font/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/assets/voxygen/font/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/assets/voxygen/font/OFL.txt b/assets/voxygen/font/OFL.txt
deleted file mode 100644
index 03e726db14..0000000000
--- a/assets/voxygen/font/OFL.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Copyright (c) 2011-2012 by Sorkin Type Co (www.sorkintype.com),
-with Reserved Font Name "Metamorphous".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 6619facfeb..7c7c30abb0 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -205,8 +205,8 @@ impl Client {
             }
 
             // Request chunks from the server
-            for i in chunk_pos.x - 4..chunk_pos.x + 5 {
-                for j in chunk_pos.y - 4..chunk_pos.y + 5 {
+            for i in chunk_pos.x - 3..chunk_pos.x + 4 {
+                for j in chunk_pos.y - 3..chunk_pos.y + 4 {
                     for k in 0..2 {
                         let key = Vec3::new(i, j, k);
                         if self.state.terrain().get_key(key).is_none()
diff --git a/server/src/lib.rs b/server/src/lib.rs
index c9196c8e9c..dafca49acf 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -181,7 +181,7 @@ impl Server {
 
         // Fetch any generated `TerrainChunk`s and insert them into the terrain
         // Also, send the chunk data to anybody that is close by
-        for (key, chunk) in self.chunk_rx.try_iter() {
+        if let Ok((key, chunk)) = self.chunk_rx.try_recv() {
             // Send the chunk to all nearby players
             for (entity, player, pos) in (
                 &self.state.ecs().entities(),
@@ -225,7 +225,7 @@ impl Server {
                 min_dist = min_dist.min(dist);
             }
 
-            if min_dist > 6 {
+            if min_dist > 5 {
                 chunks_to_remove.push(key);
             }
         });
diff --git a/voxygen/src/menu/main/start_singleplayer.rs b/voxygen/src/menu/main/start_singleplayer.rs
index a8c83457dc..0d3c8d81f0 100644
--- a/voxygen/src/menu/main/start_singleplayer.rs
+++ b/voxygen/src/menu/main/start_singleplayer.rs
@@ -35,7 +35,7 @@ impl PlayState for StartSingleplayerState {
                     match client_init.poll() {
                         Some(Ok(client)) => break client,
                         // Should always work
-                        Some(Err(err)) => unreachable!(),
+                        Some(Err(err)) => {},
                         _ => {}
                     }
                 };
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 758d740d3e..a4ea59cfaa 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -36,18 +36,24 @@ impl World {
             .set_seed(1);
         let temp_nz = Perlin::new()
             .set_seed(2);
+        let chaos_nz = Perlin::new()
+            .set_seed(3);
 
         for lpos in chunk.iter_positions() {
             let wpos = lpos + chunk_pos * chunk.get_size().map(|e| e as i32);
             let wposf = wpos.map(|e| e as f64);
 
+            let chaos_freq = 1.0 / 100.0;
             let freq = 1.0 / 128.0;
             let ampl = 32.0;
             let small_freq = 1.0 / 32.0;
             let small_ampl = 6.0;
             let offs = 32.0;
-            let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl
-                + perlin_nz.get(Vec2::from(wposf * small_freq).into_array()) * small_ampl
+
+            let chaos = chaos_nz.get(Vec2::from(wposf * chaos_freq).into_array()).max(0.0) + 0.5;
+
+            let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl * chaos
+                + perlin_nz.get(Vec2::from(wposf * small_freq).into_array()) * small_ampl * chaos
                 + offs;
             let temp = (temp_nz.get(Vec2::from(wposf * (1.0 / 64.0)).into_array()) + 1.0) * 0.5;
 

From 3705f9a871c6a1e5031887379efb0ee4845299e2 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 6 May 2019 14:22:49 +0100
Subject: [PATCH 10/22] Added anim_time to animations

Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
---
 common/src/comp/character.rs       |  1 +
 common/src/sys/control.rs          | 17 ++++++++++++++---
 server/src/lib.rs                  |  1 +
 voxygen/src/anim/character/idle.rs | 14 +++++++-------
 voxygen/src/anim/character/run.rs  | 12 ++++++------
 voxygen/src/anim/mod.rs            |  2 +-
 voxygen/src/scene/camera.rs        |  2 +-
 voxygen/src/scene/figure.rs        |  4 ++--
 voxygen/src/scene/mod.rs           |  2 +-
 9 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/common/src/comp/character.rs b/common/src/comp/character.rs
index a9e145bc45..d164b6d74b 100644
--- a/common/src/comp/character.rs
+++ b/common/src/comp/character.rs
@@ -113,6 +113,7 @@ impl Character {
 pub struct AnimationHistory {
     pub last: Option<Animation>,
     pub current: Animation,
+    pub time: f64,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/common/src/sys/control.rs b/common/src/sys/control.rs
index 78fd2d2866..f0ae77a610 100644
--- a/common/src/sys/control.rs
+++ b/common/src/sys/control.rs
@@ -10,6 +10,7 @@ use crate::{
     },
     terrain::TerrainMap,
     vol::{ReadVol, Vox},
+    state::DeltaTime,
 };
 
 // Basic ECS AI agent system
@@ -18,6 +19,7 @@ pub struct Sys;
 impl<'a> System<'a> for Sys {
     type SystemData = (
         ReadExpect<'a, TerrainMap>,
+        Read<'a, DeltaTime>,
         Entities<'a>,
         ReadStorage<'a, Pos>,
         WriteStorage<'a, Vel>,
@@ -26,7 +28,7 @@ impl<'a> System<'a> for Sys {
         ReadStorage<'a, Control>,
     );
 
-    fn run(&mut self, (terrain, entities, pos, mut vels, mut dirs, mut anims, controls): Self::SystemData) {
+    fn run(&mut self, (terrain, dt, entities, pos, mut vels, mut dirs, mut anims, controls): Self::SystemData) {
         for (entity, pos, mut vel, mut dir, control) in
             (&entities, &pos, &mut vels, &mut dirs, &controls).join()
         {
@@ -60,13 +62,22 @@ impl<'a> System<'a> for Sys {
                 Animation::Jump
             };
 
-            let last_animation = anims.get_mut(entity).map(|h| h.current);
+            let last_history = anims.get_mut(entity).cloned();
+
+            let time = if let Some((true, time)) = last_history
+                .map(|last| (last.current == animation, last.time))
+            {
+                time + dt.0 as f64
+            } else {
+                0.0
+            };
 
             anims.insert(
                 entity,
                 AnimationHistory {
-                    last: last_animation,
+                    last: last_history.map(|last| last.current),
                     current: animation,
+                    time,
                 },
             );
         }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index dafca49acf..d4e9af9777 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -137,6 +137,7 @@ impl Server {
             comp::AnimationHistory {
                 last: None,
                 current: Animation::Idle,
+                time: 0.0,
             },
         );
 
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index 901a0b9af4..38eebbd4d5 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -13,15 +13,15 @@ impl Animation for IdleAnimation {
     type Skeleton = CharacterSkeleton;
     type Dependency = f64;
 
-    fn update_skeleton(skeleton: &Self::Skeleton, time: f64) -> Self::Skeleton {
+    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave = (time as f32 * 12.0).sin();
-        let wavecos = (time as f32 * 12.0).cos();
-        let wave_slow = (time as f32 * 6.0 + PI).sin();
-        let wavecos_slow = (time as f32 * 6.0 + PI).cos();
-        let waveultra_slow = (time as f32 * 1.0 + PI).sin();
-        let waveultracos_slow = (time as f32 * 1.0 + PI).cos();
+        let wave = (anim_time as f32 * 12.0).sin();
+        let wavecos = (anim_time as f32 * 12.0).cos();
+        let wave_slow = (anim_time as f32 * 6.0 + PI).sin();
+        let wavecos_slow = (anim_time as f32 * 6.0 + PI).cos();
+        let waveultra_slow = (anim_time as f32 * 1.0 + PI).sin();
+        let waveultracos_slow = (anim_time as f32 * 1.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
         next.head.offset = Vec3::new(5.5, 0.0, 12.0 + waveultra_slow * 0.4);
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index 39269d40c8..52f83127d4 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -13,15 +13,15 @@ impl Animation for RunAnimation {
     type Skeleton = CharacterSkeleton;
     type Dependency = f64;
 
-    fn update_skeleton(skeleton: &Self::Skeleton, time: f64) -> Self::Skeleton {
+    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave = (time as f32 * 14.0).sin();
+        let wave = (anim_time as f32 * 14.0).sin();
         let wavetest = (wave.cbrt());
-        let fuzzwave = (time as f32 * 12.0).sin();
-        let wavecos = (time as f32 * 14.0).cos();
-        let wave_slow = (time as f32 * 7.0 + PI).sin();
-        let wavecos_slow = (time as f32 * 8.0 + PI).cos();
+        let fuzzwave = (anim_time as f32 * 12.0).sin();
+        let wavecos = (anim_time as f32 * 14.0).cos();
+        let wave_slow = (anim_time as f32 * 7.0 + PI).sin();
+        let wavecos_slow = (anim_time as f32 * 8.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
         next.head.offset = Vec3::new(6.0, 0.0, 12.0 + wavecos * 1.3);
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
index 47cee92280..83b8173194 100644
--- a/voxygen/src/anim/mod.rs
+++ b/voxygen/src/anim/mod.rs
@@ -50,5 +50,5 @@ pub trait Animation {
     type Dependency;
 
     /// Returns a new skeleton that is generated by the animation
-    fn update_skeleton(skeleton: &Self::Skeleton, dependency: Self::Dependency) -> Self::Skeleton;
+    fn update_skeleton(skeleton: &Self::Skeleton, dependency: Self::Dependency, anim_time: f64) -> Self::Skeleton;
 }
diff --git a/voxygen/src/scene/camera.rs b/voxygen/src/scene/camera.rs
index 7dae0f5a52..c72da5ec54 100644
--- a/voxygen/src/scene/camera.rs
+++ b/voxygen/src/scene/camera.rs
@@ -11,7 +11,7 @@ use vek::*;
 const NEAR_PLANE: f32 = 0.1;
 const FAR_PLANE: f32 = 10000.0;
 
-const INTERP_TIME: f32 = 0.2;
+const INTERP_TIME: f32 = 0.1;
 
 pub struct Camera {
     tgt_focus: Vec3<f32>,
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index a2d6cbb7aa..4e600e3ff6 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -207,10 +207,10 @@ impl FigureCache {
 
             let target_skeleton = match animation_history.current {
                 comp::character::Animation::Idle => {
-                    IdleAnimation::update_skeleton(&mut state.skeleton, time)
+                    IdleAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
                 },
                 comp::character::Animation::Run => {
-                    RunAnimation::update_skeleton(&mut state.skeleton, time)
+                    RunAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
                 },
                 comp::character::Animation::Jump => {
                     // TODO
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 0c5c2d9376..8ede8e49ad 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -115,7 +115,7 @@ impl Scene {
             .unwrap_or(Vec3::zero());
 
         // Alter camera position to match player
-        self.camera.set_focus_pos(player_pos + Vec3::unit_z() * 3.5);
+        self.camera.set_focus_pos(player_pos + Vec3::unit_z() * 2.1);
 
         // Tick camera for interpolation
         self.camera.update(client.state().get_time());

From 871767ada0d14aa999fb9178891d18cdc1f35f18 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 6 May 2019 15:26:10 +0100
Subject: [PATCH 11/22] Made single-player server start on random unused port

Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
---
 Cargo.lock                                  | 10 ++++++
 server/src/lib.rs                           | 36 ++++++++++++++-------
 voxygen/Cargo.toml                          |  1 +
 voxygen/src/menu/main/client_init.rs        |  9 ++++--
 voxygen/src/menu/main/mod.rs                |  1 +
 voxygen/src/menu/main/start_singleplayer.rs | 16 ++++++---
 voxygen/src/singleplayer.rs                 | 30 +++++++++++------
 7 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4a7395b05..177191b539 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1614,6 +1614,14 @@ dependencies = [
  "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "portpicker"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "pretty_env_logger"
 version = "0.3.0"
@@ -2360,6 +2368,7 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msgbox 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "portpicker 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "simplelog 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2750,6 +2759,7 @@ dependencies = [
 "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 "checksum png 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925"
 "checksum png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63daf481fdd0defa2d1d2be15c674fbfa1b0fd71882c303a91f9a79b3252c359"
+"checksum portpicker 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b497d05c16fe00939445c00a4fe2fa4f3d3dfc9c0401a3ab5c577afda2debb9"
 "checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
 "checksum proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)" = "ba92c84f814b3f9a44c5cfca7d2ad77fa10710867d2bbb1b3d175ab5f47daa12"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
diff --git a/server/src/lib.rs b/server/src/lib.rs
index d4e9af9777..9ea247aaad 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -8,10 +8,19 @@ pub mod input;
 // Reexports
 pub use crate::{error::Error, input::Input};
 
-use crate::{
-    client::{Client, Clients},
-    cmd::CHAT_COMMANDS,
+use std::{
+    collections::HashSet,
+    net::SocketAddr,
+    sync::mpsc,
+    time::Duration,
+    i32,
 };
+use specs::{
+    join::Join, saveload::MarkedBuilder, world::EntityBuilder as EcsEntityBuilder, Builder,
+    Entity as EcsEntity,
+};
+use threadpool::ThreadPool;
+use vek::*;
 use common::{
     comp,
     comp::character::Animation,
@@ -20,14 +29,11 @@ use common::{
     state::{State, Uid},
     terrain::TerrainChunk,
 };
-use specs::{
-    join::Join, saveload::MarkedBuilder, world::EntityBuilder as EcsEntityBuilder, Builder,
-    Entity as EcsEntity,
-};
-use std::{collections::HashSet, i32, net::SocketAddr, sync::mpsc, time::Duration};
-use threadpool::ThreadPool;
-use vek::*;
 use world::World;
+use crate::{
+    client::{Client, Clients},
+    cmd::CHAT_COMMANDS,
+};
 
 const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
 
@@ -51,9 +57,15 @@ pub struct Server {
 }
 
 impl Server {
-    /// Create a new `Server`.
+    /// Create a new `Server` bound to the default socket.
     #[allow(dead_code)]
     pub fn new() -> Result<Self, Error> {
+        Self::bind(SocketAddr::from(([0; 4], 59003)))
+    }
+
+    /// Create a new server bound to the given socket
+    #[allow(dead_code)]
+    pub fn bind<A: Into<SocketAddr>>(addrs: A) -> Result<Self, Error> {
         let (chunk_tx, chunk_rx) = mpsc::channel();
 
         let mut state = State::new();
@@ -63,7 +75,7 @@ impl Server {
             state,
             world: World::new(),
 
-            postoffice: PostOffice::bind(SocketAddr::from(([0; 4], 59003)))?,
+            postoffice: PostOffice::bind(addrs.into())?,
             clients: Clients::empty(),
 
             thread_pool: threadpool::Builder::new()
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 8a7f84fe3d..e470bc23c7 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -46,3 +46,4 @@ fnv = "1.0"
 simplelog = "0.5"
 msgbox = "0.1"
 directories = "1.0"
+portpicker = "0.1"
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 732b849179..82b920754c 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -3,6 +3,8 @@ use common::comp;
 use std::{
     sync::mpsc::{channel, Receiver, TryRecvError},
     thread::{self, JoinHandle},
+    net::ToSocketAddrs,
+    time::Duration,
 };
 
 #[derive(Debug)]
@@ -20,14 +22,17 @@ pub struct ClientInit {
     rx: Receiver<Result<Client, Error>>,
 }
 impl ClientInit {
-    pub fn new(connection_args: (String, u16, bool), client_args: (comp::Player, u64)) -> Self {
+    pub fn new(connection_args: (String, u16, bool), client_args: (comp::Player, u64), wait: bool) -> Self {
         let (server_address, default_port, prefer_ipv6) = connection_args;
         let (player, view_distance) = client_args;
 
         let (tx, rx) = channel();
 
         let handle = Some(thread::spawn(move || {
-            use std::net::ToSocketAddrs;
+            // Sleep the thread to wait for the single-player server to start up
+            if wait {
+                thread::sleep(Duration::from_millis(250));
+            }
             // Parses ip address or resolves hostname
             // Note: if you use an ipv6 address the number after the last colon will be used as the port unless you use [] around the address
             match server_address
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 78b431b9a8..417643863a 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -102,6 +102,7 @@ impl PlayState for MainMenuState {
                         client_init = client_init.or(Some(ClientInit::new(
                             (server_address, DEFAULT_PORT, false),
                             (comp::Player::new(username.clone()), 300),
+                            false,
                         )));
                     }
                     MainMenuEvent::StartSingleplayer => {
diff --git a/voxygen/src/menu/main/start_singleplayer.rs b/voxygen/src/menu/main/start_singleplayer.rs
index 0d3c8d81f0..c160439d04 100644
--- a/voxygen/src/menu/main/start_singleplayer.rs
+++ b/voxygen/src/menu/main/start_singleplayer.rs
@@ -1,19 +1,24 @@
-use super::{client_init::ClientInit, DEFAULT_PORT};
+use std::net::SocketAddr;
+use common::comp;
 use crate::{
     menu::char_selection::CharSelectionState, singleplayer::Singleplayer, Direction, GlobalState,
     PlayState, PlayStateResult,
 };
-use common::comp;
+use super::{client_init::ClientInit, DEFAULT_PORT};
 
 pub struct StartSingleplayerState {
     singleplayer: Singleplayer,
+    sock: SocketAddr,
 }
 
 impl StartSingleplayerState {
     /// Create a new `MainMenuState`
     pub fn new() -> Self {
+        let (singleplayer, sock) = Singleplayer::new();
+
         Self {
-            singleplayer: Singleplayer::new(),
+            singleplayer,
+            sock,
         }
     }
 }
@@ -23,11 +28,12 @@ impl PlayState for StartSingleplayerState {
         match direction {
             Direction::Forwards => {
                 let username = "singleplayer".to_owned();
-                let server_address = "localhost".to_owned();
+                let server_address = self.sock.ip().to_string();
 
                 let client_init = ClientInit::new(
-                    (server_address.clone(), DEFAULT_PORT, false),
+                    (server_address.clone(), self.sock.port(), false),
                     (comp::Player::new(username.clone()), 300),
+                    true,
                 );
 
                 // Client creation
diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs
index c4ad5f6eb9..364646ac24 100644
--- a/voxygen/src/singleplayer.rs
+++ b/voxygen/src/singleplayer.rs
@@ -1,9 +1,13 @@
-use common::clock::Clock;
+use std::{
+    sync::mpsc::{channel, Receiver, Sender, TryRecvError},
+    time::Duration,
+    thread::{self, JoinHandle},
+    net::SocketAddr,
+};
 use log::info;
+use portpicker::pick_unused_port;
+use common::clock::Clock;
 use server::{Event, Input, Server};
-use std::sync::mpsc::{channel, Receiver, Sender, TryRecvError};
-use std::time::Duration;
-use std::{thread, thread::JoinHandle};
 
 const TPS: u64 = 30;
 
@@ -19,15 +23,21 @@ pub struct Singleplayer {
 }
 
 impl Singleplayer {
-    pub fn new() -> Self {
+    pub fn new() -> (Self, SocketAddr) {
         let (sender, reciever) = channel();
+
+        let sock = SocketAddr::from(([0; 4], pick_unused_port()
+            .expect("Failed to find unused port")));
+
+        let sock2 = sock.clone();
         let thread = thread::spawn(move || {
-            run_server(reciever);
+            run_server(sock2, reciever);
         });
-        Singleplayer {
+
+        (Singleplayer {
             server_thread: thread,
             sender,
-        }
+        }, sock)
     }
 }
 
@@ -37,14 +47,14 @@ impl Drop for Singleplayer {
     }
 }
 
-fn run_server(rec: Receiver<Msg>) {
+fn run_server(sock: SocketAddr, rec: Receiver<Msg>) {
     info!("Starting server-cli...");
 
     // Set up an fps clock
     let mut clock = Clock::new();
 
     // Create server
-    let mut server = Server::new().expect("Failed to create server instance");
+    let mut server = Server::bind(sock).expect("Failed to create server instance");
 
     loop {
         let events = server

From d645af7d6a3acada6c41cebc0d77e22e547e4935 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 6 May 2019 16:00:11 +0100
Subject: [PATCH 12/22] Re-added license

Former-commit-id: 0d715123f3dc5f0ad4e46b28bba7b08253fc59c1
---
 assets/voxygen/font/OFL.txt | 94 +++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 assets/voxygen/font/OFL.txt

diff --git a/assets/voxygen/font/OFL.txt b/assets/voxygen/font/OFL.txt
new file mode 100644
index 0000000000..ab509e62ed
--- /dev/null
+++ b/assets/voxygen/font/OFL.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2011-2012 by Sorkin Type Co (www.sorkintype.com),
+with Reserved Font Name "Metamorphous".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

From c48a82e78d0e2628b220e767ac11b63b556a6487 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 6 May 2019 17:27:21 +0100
Subject: [PATCH 13/22] Adjusted sun and added F16 render target

Former-commit-id: 5585e0038846ef34378933eeb9051714ffe2c100
---
 voxygen/shaders/postprocess.frag            |  7 ++--
 voxygen/shaders/skybox.frag                 |  6 +--
 voxygen/src/render/mod.rs                   |  2 +-
 voxygen/src/render/pipelines/postprocess.rs |  8 ++--
 voxygen/src/render/pipelines/ui.rs          |  6 +--
 voxygen/src/render/renderer.rs              | 46 ++++++++++++++++-----
 voxygen/src/window.rs                       | 10 ++---
 7 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/voxygen/shaders/postprocess.frag b/voxygen/shaders/postprocess.frag
index d3adcf5169..392e2c6956 100644
--- a/voxygen/shaders/postprocess.frag
+++ b/voxygen/shaders/postprocess.frag
@@ -23,8 +23,7 @@ uniform u_globals {
 out vec4 tgt_color;
 
 void main() {
-	// Uncomment to invert colors
-	//tgt_color = vec4(vec3(1.0, 1.0, 1.0) - texture2D(src_color, (f_pos + 1.0) / 2.0).xyz, 1.0);
-	tgt_color = texture2D(src_color, (f_pos + 1.0) / 2.0);
-	
+	vec4 src_color = texture2D(src_color, (f_pos + 1.0) / 2.0);
+
+	tgt_color = 1.0 - 1.0 / (src_color + 1.0);
 }
diff --git a/voxygen/shaders/skybox.frag b/voxygen/shaders/skybox.frag
index caa51fe4d9..07368c5bb2 100644
--- a/voxygen/shaders/skybox.frag
+++ b/voxygen/shaders/skybox.frag
@@ -29,16 +29,16 @@ vec3 get_sky_color(vec3 dir, float time_of_day) {
 	const vec3 SKY_BOTTOM = vec3(0.0, 0.05, 0.2);
 
 	const vec3 SUN_HALO_COLOR  = vec3(1.0, 0.8, 0.5);
-	const vec3 SUN_SURF_COLOR  = vec3(1.0, 0.8, 0.5);
+	const vec3 SUN_SURF_COLOR  = vec3(1.0, 0.8, 0.0) * 100.0;
 
 	float sun_angle_rad = time_of_day * TIME_FACTOR;
 	vec3 sun_dir = vec3(sin(sun_angle_rad), 0.0, cos(sun_angle_rad));
 
 	vec3 sun_halo = pow(max(dot(dir, sun_dir), 0.0), 8.0) * SUN_HALO_COLOR;
-	vec3 sun_surf = min(pow(max(dot(dir, sun_dir), 0.0) + 0.01, 16.0), 1.0) * SUN_SURF_COLOR;
+	vec3 sun_surf = pow(max(dot(dir, sun_dir), 0.0), 1000.0) * SUN_SURF_COLOR;
 	vec3 sun_light = sun_halo + sun_surf;
 
-	return mix(SKY_BOTTOM, SKY_TOP, (dir.z + 1.0) / 2.0) + sun_light * 0.5;
+	return mix(SKY_BOTTOM, SKY_TOP, (dir.z + 1.0) / 2.0) + sun_light;
 }
 
 void main() {
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index d11de34885..511bdd2fc5 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -23,7 +23,7 @@ pub use self::{
         },
         Globals,
     },
-    renderer::{Renderer, TgtColorFmt, TgtDepthFmt},
+    renderer::{Renderer, TgtColorFmt, TgtDepthFmt, WinColorFmt, WinDepthFmt},
     texture::Texture,
 };
 
diff --git a/voxygen/src/render/pipelines/postprocess.rs b/voxygen/src/render/pipelines/postprocess.rs
index feca548759..d9b341a7f7 100644
--- a/voxygen/src/render/pipelines/postprocess.rs
+++ b/voxygen/src/render/pipelines/postprocess.rs
@@ -12,7 +12,7 @@ use gfx::{
 
 // Local
 use super::{
-    super::{Mesh, Pipeline, TgtColorFmt, TgtDepthFmt, Tri},
+    super::{Mesh, Pipeline, WinColorFmt, WinDepthFmt, Tri},
     Globals,
 };
 
@@ -31,10 +31,10 @@ gfx_defines! {
         locals: gfx::ConstantBuffer<Locals> = "u_locals",
         globals: gfx::ConstantBuffer<Globals> = "u_globals",
 
-        src_sampler: gfx::TextureSampler<<TgtColorFmt as gfx::format::Formatted>::View> = "src_color",
+        src_sampler: gfx::TextureSampler<<WinColorFmt as gfx::format::Formatted>::View> = "src_color",
 
-        tgt_color: gfx::RenderTarget<TgtColorFmt> = "tgt_color",
-        tgt_depth: gfx::DepthTarget<TgtDepthFmt> = gfx::preset::depth::PASS_TEST,
+        tgt_color: gfx::RenderTarget<WinColorFmt> = "tgt_color",
+        tgt_depth: gfx::DepthTarget<WinDepthFmt> = gfx::preset::depth::PASS_TEST,
     }
 }
 
diff --git a/voxygen/src/render/pipelines/ui.rs b/voxygen/src/render/pipelines/ui.rs
index 54bde26431..f8758418a3 100644
--- a/voxygen/src/render/pipelines/ui.rs
+++ b/voxygen/src/render/pipelines/ui.rs
@@ -1,4 +1,4 @@
-use super::super::{Pipeline, Quad, TgtColorFmt, TgtDepthFmt, Tri};
+use super::super::{Pipeline, Quad, WinColorFmt, WinDepthFmt, Tri};
 use gfx::{
     self,
     // Macros
@@ -25,8 +25,8 @@ gfx_defines! {
 
         scissor: gfx::Scissor = (),
 
-        tgt_color: gfx::BlendTarget<TgtColorFmt> = ("tgt_color", gfx::state::ColorMask::all(), gfx::preset::blend::ALPHA),
-        tgt_depth: gfx::DepthTarget<TgtDepthFmt> = gfx::preset::depth::PASS_TEST,
+        tgt_color: gfx::BlendTarget<WinColorFmt> = ("tgt_color", gfx::state::ColorMask::all(), gfx::preset::blend::ALPHA),
+        tgt_depth: gfx::DepthTarget<WinDepthFmt> = gfx::preset::depth::PASS_TEST,
     }
 }
 
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index f3645326d7..1b9b8797d1 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -15,16 +15,26 @@ use gfx::{
 use image;
 use vek::*;
 
-/// Represents the format of the window's color target.
-pub type TgtColorFmt = gfx::format::Rgba8;
-/// Represents the format of the window's depth target.
+/// Represents the format of the pre-processed color target.
+pub type TgtColorFmt = gfx::format::Rgba16F;
+/// Represents the format of the pre-processed depth target.
 pub type TgtDepthFmt = gfx::format::DepthStencil;
 
-/// A handle to a window color target.
+/// Represents the format of the window's color target.
+pub type WinColorFmt = gfx::format::Rgba8;
+/// Represents the format of the window's depth target.
+pub type WinDepthFmt = gfx::format::DepthStencil;
+
+/// A handle to a pre-processed color target.
 pub type TgtColorView = gfx::handle::RenderTargetView<gfx_backend::Resources, TgtColorFmt>;
-/// A handle to a window depth target.
+/// A handle to a pre-processed depth target.
 pub type TgtDepthView = gfx::handle::DepthStencilView<gfx_backend::Resources, TgtDepthFmt>;
 
+/// A handle to a window color target.
+pub type WinColorView = gfx::handle::RenderTargetView<gfx_backend::Resources, WinColorFmt>;
+/// A handle to a window depth target.
+pub type WinDepthView = gfx::handle::DepthStencilView<gfx_backend::Resources, WinDepthFmt>;
+
 /// A handle to a render color target as a resource.
 pub type TgtColorRes = gfx::handle::ShaderResourceView<
     gfx_backend::Resources,
@@ -39,8 +49,8 @@ pub struct Renderer {
     encoder: gfx::Encoder<gfx_backend::Resources, gfx_backend::CommandBuffer>,
     factory: gfx_backend::Factory,
 
-    win_color_view: TgtColorView,
-    win_depth_view: TgtDepthView,
+    win_color_view: WinColorView,
+    win_depth_view: WinDepthView,
 
     tgt_color_view: TgtColorView,
     tgt_depth_view: TgtDepthView,
@@ -62,8 +72,8 @@ impl Renderer {
     pub fn new(
         device: gfx_backend::Device,
         mut factory: gfx_backend::Factory,
-        win_color_view: TgtColorView,
-        win_depth_view: TgtDepthView,
+        win_color_view: WinColorView,
+        win_depth_view: WinDepthView,
     ) -> Result<Self, RenderError> {
         // Construct a pipeline for rendering skyboxes
         let skybox_pipeline = create_pipeline(
@@ -139,13 +149,27 @@ impl Renderer {
         })
     }
 
+    /// Get references to the internal render target views that get rendered to before post-processing.
+    #[allow(dead_code)]
+    pub fn tgt_views(&self) -> (&TgtColorView, &TgtDepthView) {
+        (&self.tgt_color_view, &self.tgt_depth_view)
+    }
+
     /// Get references to the internal render target views that get displayed directly by the window.
-    pub fn target_views(&self) -> (&TgtColorView, &TgtDepthView) {
+    #[allow(dead_code)]
+    pub fn win_views(&self) -> (&WinColorView, &WinDepthView) {
         (&self.win_color_view, &self.win_depth_view)
     }
 
+    /// Get mutable references to the internal render target views that get rendered to before post-processing.
+    #[allow(dead_code)]
+    pub fn tgt_views_mut(&mut self) -> (&mut TgtColorView, &mut TgtDepthView) {
+        (&mut self.tgt_color_view, &mut self.tgt_depth_view)
+    }
+
     /// Get mutable references to the internal render target views that get displayed directly by the window.
-    pub fn target_views_mut(&mut self) -> (&mut TgtColorView, &mut TgtDepthView) {
+    #[allow(dead_code)]
+    pub fn win_views_mut(&mut self) -> (&mut WinColorView, &mut WinDepthView) {
         (&mut self.win_color_view, &mut self.win_depth_view)
     }
 
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index ad33f2d9ce..1121f958bb 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1,5 +1,5 @@
 use crate::{
-    render::{Renderer, TgtColorFmt, TgtDepthFmt},
+    render::{Renderer, WinColorFmt, WinDepthFmt},
     settings::Settings,
     ui, Error,
 };
@@ -29,8 +29,8 @@ impl Window {
             .with_gl(glutin::GlRequest::Specific(glutin::Api::OpenGl, (3, 2)))
             .with_vsync(false);
 
-        let (window, device, factory, tgt_color_view, tgt_depth_view) =
-            gfx_window_glutin::init::<TgtColorFmt, TgtDepthFmt>(
+        let (window, device, factory, win_color_view, win_depth_view) =
+            gfx_window_glutin::init::<WinColorFmt, WinDepthFmt>(
                 win_builder,
                 ctx_builder,
                 &events_loop,
@@ -58,7 +58,7 @@ impl Window {
 
         let tmp = Ok(Self {
             events_loop,
-            renderer: Renderer::new(device, factory, tgt_color_view, tgt_depth_view)?,
+            renderer: Renderer::new(device, factory, win_color_view, win_depth_view)?,
             window,
             cursor_grabbed: false,
             needs_refresh_resize: false,
@@ -101,7 +101,7 @@ impl Window {
                 glutin::Event::WindowEvent { event, .. } => match event {
                     glutin::WindowEvent::CloseRequested => events.push(Event::Close),
                     glutin::WindowEvent::Resized(glutin::dpi::LogicalSize { width, height }) => {
-                        let (mut color_view, mut depth_view) = renderer.target_views_mut();
+                        let (mut color_view, mut depth_view) = renderer.tgt_views_mut();
                         gfx_window_glutin::update_views(&window, &mut color_view, &mut depth_view);
                         renderer.on_resize().unwrap();
                         events.push(Event::Resize(Vec2::new(width as u32, height as u32)));

From e5db851f30b23ce279bad038f9c36715ff9d1a23 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 7 May 2019 11:27:52 +0100
Subject: [PATCH 14/22] Added FXAA to post-processing shader

Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62
---
 voxygen/shaders/figure.frag         |   1 +
 voxygen/shaders/figure.vert         |   1 +
 voxygen/shaders/postprocess.frag    | 139 +++++++++++++++++++++++++++-
 voxygen/shaders/postprocess.vert    |   1 +
 voxygen/shaders/skybox.frag         |   1 +
 voxygen/shaders/skybox.vert         |   1 +
 voxygen/shaders/terrain.frag        |   1 +
 voxygen/shaders/terrain.vert        |   1 +
 voxygen/src/render/pipelines/mod.rs |   4 +
 voxygen/src/scene/mod.rs            |   1 +
 10 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/voxygen/shaders/figure.frag b/voxygen/shaders/figure.frag
index bf6889d61c..6bc12dafb3 100644
--- a/voxygen/shaders/figure.frag
+++ b/voxygen/shaders/figure.frag
@@ -19,6 +19,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 struct BoneData {
diff --git a/voxygen/shaders/figure.vert b/voxygen/shaders/figure.vert
index 7880d7876c..2c7c87d508 100644
--- a/voxygen/shaders/figure.vert
+++ b/voxygen/shaders/figure.vert
@@ -19,6 +19,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 struct BoneData {
diff --git a/voxygen/shaders/postprocess.frag b/voxygen/shaders/postprocess.frag
index 392e2c6956..2b5dab93f8 100644
--- a/voxygen/shaders/postprocess.frag
+++ b/voxygen/shaders/postprocess.frag
@@ -18,12 +18,145 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec4 tgt_color;
 
-void main() {
-	vec4 src_color = texture2D(src_color, (f_pos + 1.0) / 2.0);
+/**
+Basic FXAA implementation based on the code on geeks3d.com with the
+modification that the texture2DLod stuff was removed since it's
+unsupported by WebGL.
 
-	tgt_color = 1.0 - 1.0 / (src_color + 1.0);
+--
+
+From:
+https://github.com/mitsuhiko/webgl-meincraft
+
+Copyright (c) 2011 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of the contributors may not be used to endorse or
+      promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef FXAA_REDUCE_MIN
+    #define FXAA_REDUCE_MIN   (1.0/ 128.0)
+#endif
+#ifndef FXAA_REDUCE_MUL
+    #define FXAA_REDUCE_MUL   (1.0 / 8.0)
+#endif
+#ifndef FXAA_SPAN_MAX
+    #define FXAA_SPAN_MAX     8.0
+#endif
+
+//optimized version for mobile, where dependent
+//texture reads can be a bottleneck
+vec4 fxaa(sampler2D tex, vec2 fragCoord, vec2 resolution,
+            vec2 v_rgbNW, vec2 v_rgbNE,
+            vec2 v_rgbSW, vec2 v_rgbSE,
+            vec2 v_rgbM) {
+    vec4 color;
+    mediump vec2 inverseVP = vec2(1.0 / resolution.x, 1.0 / resolution.y);
+    vec3 rgbNW = texture2D(tex, v_rgbNW).xyz;
+    vec3 rgbNE = texture2D(tex, v_rgbNE).xyz;
+    vec3 rgbSW = texture2D(tex, v_rgbSW).xyz;
+    vec3 rgbSE = texture2D(tex, v_rgbSE).xyz;
+    vec4 texColor = texture2D(tex, v_rgbM);
+    vec3 rgbM  = texColor.xyz;
+    vec3 luma = vec3(0.299, 0.587, 0.114);
+    float lumaNW = dot(rgbNW, luma);
+    float lumaNE = dot(rgbNE, luma);
+    float lumaSW = dot(rgbSW, luma);
+    float lumaSE = dot(rgbSE, luma);
+    float lumaM  = dot(rgbM,  luma);
+    float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+    float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+
+    mediump vec2 dir;
+    dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+    dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+
+    float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
+                          (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
+
+    float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
+    dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
+              max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
+              dir * rcpDirMin)) * inverseVP;
+
+    vec3 rgbA = 0.5 * (
+        texture2D(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz +
+        texture2D(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);
+    vec3 rgbB = rgbA * 0.5 + 0.25 * (
+        texture2D(tex, fragCoord * inverseVP + dir * -0.5).xyz +
+        texture2D(tex, fragCoord * inverseVP + dir * 0.5).xyz);
+
+    float lumaB = dot(rgbB, luma);
+    if ((lumaB < lumaMin) || (lumaB > lumaMax))
+        color = vec4(rgbA, texColor.a);
+    else
+        color = vec4(rgbB, texColor.a);
+    return color;
+}
+
+
+void texcoords(vec2 fragCoord, vec2 resolution,
+			out vec2 v_rgbNW, out vec2 v_rgbNE,
+			out vec2 v_rgbSW, out vec2 v_rgbSE,
+			out vec2 v_rgbM) {
+	vec2 inverseVP = 1.0 / resolution.xy;
+	v_rgbNW = (fragCoord + vec2(-1.0, -1.0)) * inverseVP;
+	v_rgbNE = (fragCoord + vec2(1.0, -1.0)) * inverseVP;
+	v_rgbSW = (fragCoord + vec2(-1.0, 1.0)) * inverseVP;
+	v_rgbSE = (fragCoord + vec2(1.0, 1.0)) * inverseVP;
+	v_rgbM = vec2(fragCoord * inverseVP);
+}
+
+
+vec4 fxaa_apply(sampler2D tex, vec2 fragCoord, vec2 resolution) {
+	mediump vec2 v_rgbNW;
+	mediump vec2 v_rgbNE;
+	mediump vec2 v_rgbSW;
+	mediump vec2 v_rgbSE;
+	mediump vec2 v_rgbM;
+
+	//compute the texture coords
+	texcoords(fragCoord, resolution, v_rgbNW, v_rgbNE, v_rgbSW, v_rgbSE, v_rgbM);
+
+	//compute FXAA
+	return fxaa(tex, fragCoord, resolution, v_rgbNW, v_rgbNE, v_rgbSW, v_rgbSE, v_rgbM);
+}
+
+void main() {
+	vec2 uv = (f_pos + 1.0) * 0.5;
+	vec4 color = fxaa_apply(src_color, uv * screen_res.xy, screen_res.xy);
+
+	tgt_color = 1.0 - 1.0 / (color + 1.0);
 }
diff --git a/voxygen/shaders/postprocess.vert b/voxygen/shaders/postprocess.vert
index 91cde43fb7..7d3c4774f0 100644
--- a/voxygen/shaders/postprocess.vert
+++ b/voxygen/shaders/postprocess.vert
@@ -16,6 +16,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec2 f_pos;
diff --git a/voxygen/shaders/skybox.frag b/voxygen/shaders/skybox.frag
index 07368c5bb2..b4ed5511a1 100644
--- a/voxygen/shaders/skybox.frag
+++ b/voxygen/shaders/skybox.frag
@@ -16,6 +16,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec4 tgt_color;
diff --git a/voxygen/shaders/skybox.vert b/voxygen/shaders/skybox.vert
index 165e747ae9..825bbe7e88 100644
--- a/voxygen/shaders/skybox.vert
+++ b/voxygen/shaders/skybox.vert
@@ -16,6 +16,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec3 f_pos;
diff --git a/voxygen/shaders/terrain.frag b/voxygen/shaders/terrain.frag
index 1b718c3633..45ed1a4ce9 100644
--- a/voxygen/shaders/terrain.frag
+++ b/voxygen/shaders/terrain.frag
@@ -18,6 +18,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec4 tgt_color;
diff --git a/voxygen/shaders/terrain.vert b/voxygen/shaders/terrain.vert
index e195a1c464..89a386587c 100644
--- a/voxygen/shaders/terrain.vert
+++ b/voxygen/shaders/terrain.vert
@@ -18,6 +18,7 @@ uniform u_globals {
 	vec4 view_distance;
 	vec4 time_of_day;
 	vec4 tick;
+	vec4 screen_res;
 };
 
 out vec3 f_pos;
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index c425c2d5eb..f58b520ee4 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -27,6 +27,7 @@ gfx_defines! {
         view_distance: [f32; 4] = "view_distance",
         time_of_day: [f32; 4] = "time_of_day", // TODO: Make this f64
         tick: [f32; 4] = "tick",
+        screen_res: [f32; 4] = "screen_res",
     }
 }
 
@@ -41,6 +42,7 @@ impl Globals {
             view_distance: [0.0; 4],
             time_of_day: [0.0; 4],
             tick: [0.0; 4],
+            screen_res: [800.0, 500.0, 0.0, 0.0],
         }
     }
 
@@ -53,6 +55,7 @@ impl Globals {
         view_distance: f32,
         time_of_day: f64,
         tick: f64,
+        screen_res: Vec2<u16>,
     ) -> Self {
         Self {
             view_mat: arr_to_mat(view_mat.into_col_array()),
@@ -62,6 +65,7 @@ impl Globals {
             view_distance: [view_distance; 4],
             time_of_day: [time_of_day as f32; 4],
             tick: [tick as f32; 4],
+            screen_res: Vec4::from(screen_res.map(|e| e as f32)).into_array(),
         }
     }
 }
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 8ede8e49ad..e445495cf3 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -135,6 +135,7 @@ impl Scene {
                     10.0,
                     client.state().get_time_of_day(),
                     client.state().get_time(),
+                    renderer.get_resolution(),
                 )],
             )
             .expect("Failed to update global constants");

From df9b64355a819be58137427e729679acbefdd2a5 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 7 May 2019 12:09:50 +0100
Subject: [PATCH 15/22] Improved singleplayer error handling

Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b
---
 voxygen/src/menu/main/client_init.rs        | 5 +++--
 voxygen/src/menu/main/mod.rs                | 1 +
 voxygen/src/menu/main/start_singleplayer.rs | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 82b920754c..239d7646bd 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -15,6 +15,7 @@ pub enum Error {
     NoAddress,
     // Parsing/host name resolution successful but could not connect
     ConnectionFailed(ClientError),
+    ClientCrashed,
 }
 
 // Used to asynchronusly parse the server address, resolve host names, and create the client (which involves establishing a connection to the server)
@@ -31,7 +32,7 @@ impl ClientInit {
         let handle = Some(thread::spawn(move || {
             // Sleep the thread to wait for the single-player server to start up
             if wait {
-                thread::sleep(Duration::from_millis(250));
+                thread::sleep(Duration::from_millis(500));
             }
             // Parses ip address or resolves hostname
             // Note: if you use an ipv6 address the number after the last colon will be used as the port unless you use [] around the address
@@ -85,7 +86,7 @@ impl ClientInit {
         match self.rx.try_recv() {
             Ok(result) => Some(result),
             Err(TryRecvError::Empty) => None,
-            Err(TryRecvError::Disconnected) => panic!("Thread panicked or already finished"),
+            Err(TryRecvError::Disconnected) => Some(Err(Error::ClientCrashed)),
         }
     }
 }
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 417643863a..f87fd6128b 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -78,6 +78,7 @@ impl PlayState for MainMenuState {
                         match err {
                             InitError::BadAddress(_) | InitError::NoAddress => "Server not found",
                             InitError::ConnectionFailed(_) => "Connection failed",
+                            InitError::ClientCrashed => "Client crashed",
                         }
                         .to_string(),
                     );
diff --git a/voxygen/src/menu/main/start_singleplayer.rs b/voxygen/src/menu/main/start_singleplayer.rs
index c160439d04..841d876205 100644
--- a/voxygen/src/menu/main/start_singleplayer.rs
+++ b/voxygen/src/menu/main/start_singleplayer.rs
@@ -1,4 +1,5 @@
 use std::net::SocketAddr;
+use log::warn;
 use common::comp;
 use crate::{
     menu::char_selection::CharSelectionState, singleplayer::Singleplayer, Direction, GlobalState,
@@ -40,8 +41,11 @@ impl PlayState for StartSingleplayerState {
                 let client = loop {
                     match client_init.poll() {
                         Some(Ok(client)) => break client,
-                        // Should always work
-                        Some(Err(err)) => {},
+                        // An error occured!
+                        Some(Err(err)) => {
+                            warn!("Failed to start singleplayer server: {:?}", err);
+                            return PlayStateResult::Pop;
+                        },
                         _ => {}
                     }
                 };

From 6da495f0bdcea02085cb3b1c4171219c6b82b06a Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 7 May 2019 12:27:40 +0100
Subject: [PATCH 16/22] Fixed window resizing

Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032
---
 voxygen/src/render/renderer.rs | 4 ++--
 voxygen/src/window.rs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 1b9b8797d1..bc553ae536 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -202,8 +202,8 @@ impl Renderer {
     /// Get the resolution of the render target.
     pub fn get_resolution(&self) -> Vec2<u16> {
         Vec2::new(
-            self.tgt_color_view.get_dimensions().0,
-            self.tgt_color_view.get_dimensions().1,
+            self.win_color_view.get_dimensions().0,
+            self.win_color_view.get_dimensions().1,
         )
     }
 
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 1121f958bb..9f5cdd44fb 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -101,7 +101,7 @@ impl Window {
                 glutin::Event::WindowEvent { event, .. } => match event {
                     glutin::WindowEvent::CloseRequested => events.push(Event::Close),
                     glutin::WindowEvent::Resized(glutin::dpi::LogicalSize { width, height }) => {
-                        let (mut color_view, mut depth_view) = renderer.tgt_views_mut();
+                        let (mut color_view, mut depth_view) = renderer.win_views_mut();
                         gfx_window_glutin::update_views(&window, &mut color_view, &mut depth_view);
                         renderer.on_resize().unwrap();
                         events.push(Event::Resize(Vec2::new(width as u32, height as u32)));

From ac78d322d687959288fa21c1ac8558a1131bfc15 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Thu, 9 May 2019 06:32:44 -0400
Subject: [PATCH 17/22] animation orientation fix, first jump

Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
---
 assets/voxygen/voxel/belt.vox      |  2 +-
 assets/voxygen/voxel/chest.vox     |  4 +-
 assets/voxygen/voxel/foot.vox      |  2 +-
 assets/voxygen/voxel/head.vox      |  4 +-
 assets/voxygen/voxel/pants.vox     |  4 +-
 assets/voxygen/voxel/sword.vox     |  2 +-
 voxygen/src/anim/character/idle.rs | 54 ++++++++++----------
 voxygen/src/anim/character/jump.rs | 80 ++++++++++++++++++++++++++++++
 voxygen/src/anim/character/mod.rs  |  3 +-
 voxygen/src/anim/character/run.rs  | 34 ++++++-------
 voxygen/src/scene/figure.rs        | 24 ++++-----
 voxygen/src/singleplayer.rs        |  2 +-
 12 files changed, 148 insertions(+), 67 deletions(-)
 create mode 100644 voxygen/src/anim/character/jump.rs

diff --git a/assets/voxygen/voxel/belt.vox b/assets/voxygen/voxel/belt.vox
index 41b283b6ea..c3f6db572d 100644
--- a/assets/voxygen/voxel/belt.vox
+++ b/assets/voxygen/voxel/belt.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2e5445d2f4338b00ad1a69fafab99c5ad13edc26de817cc1b6ce3c615a44635
+oid sha256:9a321c80f87a239ce9a4de743a889b31ebb57831acfcb6fc77928c9b26700df2
 size 1544
diff --git a/assets/voxygen/voxel/chest.vox b/assets/voxygen/voxel/chest.vox
index 86794fabaf..9af67e7cbc 100644
--- a/assets/voxygen/voxel/chest.vox
+++ b/assets/voxygen/voxel/chest.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c7c93fd3a28611bc93ba532d39fbbec594c21ab2f91a9925e11f15bb13a5371
-size 45499
+oid sha256:200cdedef555fa03b7761e0a3a4209de76851f007b6b137bd77925a49051e560
+size 2392
diff --git a/assets/voxygen/voxel/foot.vox b/assets/voxygen/voxel/foot.vox
index e2478167a1..c2e2dce585 100644
--- a/assets/voxygen/voxel/foot.vox
+++ b/assets/voxygen/voxel/foot.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e9e0a34b70a5d4a1bddb306dfac354a95f3ce924f74484ebec4c8599c9caf70
+oid sha256:dcf8aa1a237dba07f8e078a71612d7ab44412a12950964a1d92856eaf5f2db62
 size 44523
diff --git a/assets/voxygen/voxel/head.vox b/assets/voxygen/voxel/head.vox
index 04e2fe94a3..0ebfea4bf0 100644
--- a/assets/voxygen/voxel/head.vox
+++ b/assets/voxygen/voxel/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:479fcf40c20598bf284dca6fab690a351abc5a9b47d841f604667799f5c76c31
-size 48059
+oid sha256:57c31358507b87f7c88e18a54466f97e4f2603427dcd4892e14bfa38a4fa3dda
+size 4608
diff --git a/assets/voxygen/voxel/pants.vox b/assets/voxygen/voxel/pants.vox
index eb492cc6c8..0913ab44b5 100644
--- a/assets/voxygen/voxel/pants.vox
+++ b/assets/voxygen/voxel/pants.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:365dbba45692d85df10dd9fb0d89b318f6f63bb3f713767ae0f75b63110164fe
-size 44891
+oid sha256:d73f412dc1f75af7cb0fcd7a46d02c464d1bcde6fc6143827c3bfec4276f61ad
+size 1784
diff --git a/assets/voxygen/voxel/sword.vox b/assets/voxygen/voxel/sword.vox
index b203a5e297..3cc01d1cbc 100644
--- a/assets/voxygen/voxel/sword.vox
+++ b/assets/voxygen/voxel/sword.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eab472ba789f881e5abe85f5a5bf55a2bb178fdcbebbb735453621f16a63b55
+oid sha256:e458a391915d1381c5c8f995da96310e521a441d0e14e67bcacad423ffc68857
 size 1568
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index 38eebbd4d5..fe793d736d 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -24,62 +24,62 @@ impl Animation for IdleAnimation {
         let waveultracos_slow = (anim_time as f32 * 1.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
-        next.head.offset = Vec3::new(5.5, 0.0, 12.0 + waveultra_slow * 0.4);
-        next.head.ori = Quaternion::rotation_y(waveultra_slow * 0.05);
+        next.head.offset = Vec3::new(5.5, 2.0, 11.5 + waveultra_slow * 0.4);
+        next.head.ori = Quaternion::rotation_x(waveultra_slow * 0.05);
         next.head.scale = Vec3::one();
 
-        next.chest.offset = Vec3::new(2.5, 0.0, 8.0 + waveultra_slow * 0.4);
-        next.chest.ori = Quaternion::rotation_y(0.0);
+        next.chest.offset = Vec3::new(5.5, 0.0, 7.5 + waveultra_slow * 0.4);
+        next.chest.ori = Quaternion::rotation_x(0.0);
         next.chest.scale = Vec3::one();
 
-        next.belt.offset = Vec3::new(2.5, 0.0, 6.0 + waveultra_slow * 0.4);
-        next.belt.ori = Quaternion::rotation_y(0.0);
+        next.belt.offset = Vec3::new(5.5, 0.0, 5.5 + waveultra_slow * 0.4);
+        next.belt.ori = Quaternion::rotation_x(0.0);
         next.belt.scale = Vec3::one();
 
-        next.shorts.offset = Vec3::new(2.5, 0.0, 3.0 + waveultra_slow * 0.4);
-        next.shorts.ori = Quaternion::rotation_y(0.0);
+        next.shorts.offset = Vec3::new(5.5, 0.0, 2.5 + waveultra_slow * 0.4);
+        next.shorts.ori = Quaternion::rotation_x(0.0);
         next.shorts.scale = Vec3::one();
 
         next.l_hand.offset = Vec3::new(
-            2.0 + waveultracos_slow * 0.3,
-            7.5,
-            12.5 + waveultra_slow * 1.1,
+            -7.5, -2.0 + waveultracos_slow * 0.3,
+            
+            12.0 + waveultra_slow * 1.1,
         );
-        next.l_hand.ori = Quaternion::rotation_y(0.0 + waveultra_slow * 0.06);
+        next.l_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
         next.l_hand.scale = Vec3::one();
 
         next.r_hand.offset = Vec3::new(
-            2.0 + waveultracos_slow * 0.3,
-            -7.5,
-            12.5 + waveultra_slow * 1.1,
+            7.5, -2.0 + waveultracos_slow * 0.3,
+            
+            12.0 + waveultra_slow * 1.1,
         );
-        next.r_hand.ori = Quaternion::rotation_y(0.0 + waveultra_slow * 0.06);
+        next.r_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
         next.r_hand.scale = Vec3::one();
 
-        next.l_foot.offset = Vec3::new(5.0, 3.4, 8.0);
-        next.l_foot.ori = Quaternion::rotation_y(0.04 + waveultra_slow * 0.04);
+        next.l_foot.offset = Vec3::new(-3.4, 0.0, 8.0);
+        next.l_foot.ori = Quaternion::rotation_x(-0.04 - waveultra_slow * 0.04);
         next.l_foot.scale = Vec3::one();
 
-        next.r_foot.offset = Vec3::new(5.0, -3.4, 8.0);
-        next.r_foot.ori = Quaternion::rotation_y(0.04 + waveultra_slow * 0.04);
+        next.r_foot.offset = Vec3::new(3.4, 0.0, 8.0);
+        next.r_foot.ori = Quaternion::rotation_x(-0.04 - waveultra_slow * 0.04);
         next.r_foot.scale = Vec3::one();
 
-        next.weapon.offset = Vec3::new(-4.5, 14.0, 13.0);
-        next.weapon.ori = Quaternion::rotation_x(2.5);
+        next.weapon.offset = Vec3::new(-5.0, -6.0, 18.5);
+        next.weapon.ori = Quaternion::rotation_y(2.5);
         next.weapon.scale = Vec3::one();
 
-        next.torso.offset = Vec3::new(-0.5, 0.0, 0.0);
-        next.torso.ori = Quaternion::rotation_y(0.0);
+        next.torso.offset = Vec3::new(-0.5, 0.0, 0.1);
+        next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0;
 
         next.l_shoulder.offset = Vec3::new(2.9, 6.0, 18.0);
-        next.l_shoulder.ori = Quaternion::rotation_y(0.0);
+        next.l_shoulder.ori = Quaternion::rotation_x(0.0);
         next.l_shoulder.scale = Vec3::one();
 
         next.r_shoulder.offset = Vec3::new(2.9, -6.0, 18.0);
-        next.r_shoulder.ori = Quaternion::rotation_y(0.0);
+        next.r_shoulder.ori = Quaternion::rotation_x(0.0);
         next.r_shoulder.scale = Vec3::one();
 
         next
     }
-}
+}
\ No newline at end of file
diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs
new file mode 100644
index 0000000000..eb51a583a7
--- /dev/null
+++ b/voxygen/src/anim/character/jump.rs
@@ -0,0 +1,80 @@
+// Standard
+use std::f32::consts::PI;
+
+// Library
+use vek::*;
+
+// Local
+use super::{super::Animation, CharacterSkeleton, SCALE};
+//
+
+pub struct JumpAnimation;
+
+impl Animation for JumpAnimation {
+    type Skeleton = CharacterSkeleton;
+    type Dependency = f64;
+
+    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
+        let mut next = (*skeleton).clone();
+        let wave = (anim_time as f32 * 14.0).sin();        
+        let arcwave = (1.0f32.ln_1p() - 1.0).abs();
+        let wavetest = (wave.cbrt());
+        let fuzzwave = (anim_time as f32 * 12.0).sin();
+        let wavecos = (anim_time as f32 * 14.0).cos();
+        let wave_slow = (anim_time as f32 * 5.0 + PI).sin();
+        let wave_slowtest = (anim_time as f32).min(PI/2.0).sin();
+        let wavecos_slow = (anim_time as f32 * 8.0 + PI).cos();
+        let wave_dip = (wave_slow.abs() - 0.5).abs();
+        let mult = wave_slow / (wave_slow.abs());
+
+        next.head.offset = Vec3::new(5.5, 2.0, 12.0);
+        next.head.ori = Quaternion::rotation_x(0.15);
+        next.head.scale = Vec3::one();
+
+        next.chest.offset = Vec3::new(5.5, 0.0, 8.0);
+        next.chest.ori = Quaternion::rotation_z(0.0);
+        next.chest.scale = Vec3::one();
+
+        next.belt.offset = Vec3::new(5.5, 0.0, 6.0);
+        next.belt.ori = Quaternion::rotation_z(0.0);
+        next.belt.scale = Vec3::one();
+
+        next.shorts.offset = Vec3::new(5.5, 0.0, 3.0);
+        next.shorts.ori = Quaternion::rotation_z(0.0);
+        next.shorts.scale = Vec3::one();
+
+        next.l_hand.offset = Vec3::new(-7.5, -2.0, 12.0);
+        next.l_hand.ori = Quaternion::rotation_x(0.8);
+        next.l_hand.scale = Vec3::one();
+
+        next.r_hand.offset = Vec3::new(7.5, -2.0, 12.0);
+        next.r_hand.ori = Quaternion::rotation_x(-0.8);
+        next.r_hand.scale = Vec3::one();
+
+        next.l_foot.offset = Vec3::new(-3.4, 1.0, 6.0);
+        next.l_foot.ori = Quaternion::rotation_x(wave_slow * -1.2);
+        next.l_foot.scale = Vec3::one();
+
+        next.r_foot.offset = Vec3::new(3.4, -1.0, 6.0);
+        next.r_foot.ori = Quaternion::rotation_x(wave_slow * 1.2);
+        next.r_foot.scale = Vec3::one();
+
+        next.weapon.offset = Vec3::new(-5.0, -6.0, 19.0);
+        next.weapon.ori = Quaternion::rotation_y(2.5);
+        next.weapon.scale = Vec3::one();
+
+        next.torso.offset = Vec3::new(-0.5, 0.0, 0.2);
+        next.torso.ori = Quaternion::rotation_x(0.0);
+        next.torso.scale = Vec3::one() / 11.0;
+
+        next.l_shoulder.offset = Vec3::new(3.0, 6.0, 18.0);
+        next.l_shoulder.ori = Quaternion::rotation_y(0.0);
+        next.l_shoulder.scale = Vec3::one();
+
+        next.r_shoulder.offset = Vec3::new(3.0, -6.0, 18.0);
+        next.r_shoulder.ori = Quaternion::rotation_y(0.0);
+        next.r_shoulder.scale = Vec3::one();
+
+        next
+    }
+}
diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index c0f15f1da3..26083a4184 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -1,10 +1,11 @@
 pub mod idle;
 pub mod run;
+pub mod jump;
 
 // Reexports
 pub use self::idle::IdleAnimation;
 pub use self::run::RunAnimation;
-
+pub use self::jump::JumpAnimation;
 // Crate
 use crate::render::FigureBoneData;
 
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index 52f83127d4..07bb32737f 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -24,44 +24,44 @@ impl Animation for RunAnimation {
         let wavecos_slow = (anim_time as f32 * 8.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
-        next.head.offset = Vec3::new(6.0, 0.0, 12.0 + wavecos * 1.3);
-        next.head.ori = Quaternion::rotation_y(-0.15);
+        next.head.offset = Vec3::new(5.5, 2.0, 12.0 + wavecos * 1.3);
+        next.head.ori = Quaternion::rotation_x(0.15);
         next.head.scale = Vec3::one();
 
-        next.chest.offset = Vec3::new(2.5, 0.0, 8.0 + wavecos * 1.1);
+        next.chest.offset = Vec3::new(5.5, 0.0, 8.0 + wavecos * 1.1);
         next.chest.ori = Quaternion::rotation_z(wave * 0.1);
         next.chest.scale = Vec3::one();
 
-        next.belt.offset = Vec3::new(2.5, 0.0, 6.0 + wavecos * 1.1);
+        next.belt.offset = Vec3::new(5.5, 0.0, 6.0 + wavecos * 1.1);
         next.belt.ori = Quaternion::rotation_z(wave * 0.25);
         next.belt.scale = Vec3::one();
 
-        next.shorts.offset = Vec3::new(2.5, 0.0, 3.0 + wavecos * 1.1);
+        next.shorts.offset = Vec3::new(5.5, 0.0, 3.0 + wavecos * 1.1);
         next.shorts.ori = Quaternion::rotation_z(wave * 0.6);
         next.shorts.scale = Vec3::one();
 
-        next.l_hand.offset = Vec3::new(2.0 - wavecos * 2.5, 7.5, 12.0 + wave * 1.5);
-        next.l_hand.ori = Quaternion::rotation_y(wavecos * 0.9);
+        next.l_hand.offset = Vec3::new(-7.5, -2.0 + wavecos * 2.5, 12.0 - wave * 1.5);
+        next.l_hand.ori = Quaternion::rotation_x(wavecos * 0.9);
         next.l_hand.scale = Vec3::one();
 
-        next.r_hand.offset = Vec3::new(2.0 + wavecos * 2.5, -7.5, 12.0 - wave * 1.5);
-        next.r_hand.ori = Quaternion::rotation_y(wavecos * -0.9);
+        next.r_hand.offset = Vec3::new(7.5, -2.0 - wavecos * 2.5, 12.0 + wave * 1.5);
+        next.r_hand.ori = Quaternion::rotation_x(wavecos * -0.9);
         next.r_hand.scale = Vec3::one();
 
-        next.l_foot.offset = Vec3::new(3.5 + wave * 1.0, 3.4, 6.0);
-        next.l_foot.ori = Quaternion::rotation_y(-0.0 - wave * 1.5);
+        next.l_foot.offset = Vec3::new(-3.4, 0.0 + wave * 1.0, 6.0);
+        next.l_foot.ori = Quaternion::rotation_x(-0.0 - wave * 1.5);
         next.l_foot.scale = Vec3::one();
 
-        next.r_foot.offset = Vec3::new(3.5 - wave * 1.0, -3.4, 6.0);
-        next.r_foot.ori = Quaternion::rotation_y(-0.0 + wave * 1.5);
+        next.r_foot.offset = Vec3::new(3.4, 0.0 - wave * 1.0, 6.0);
+        next.r_foot.ori = Quaternion::rotation_x(-0.0 + wave * 1.5);
         next.r_foot.scale = Vec3::one();
 
-        next.weapon.offset = Vec3::new(-5.0, 14.0, 13.0);
-        next.weapon.ori = Quaternion::rotation_x(2.5);
+        next.weapon.offset = Vec3::new(-5.0, -6.0, 19.0);
+        next.weapon.ori = Quaternion::rotation_y(2.5);
         next.weapon.scale = Vec3::one();
 
-        next.torso.offset = Vec3::new(-0.5, 0.0, 0.0);
-        next.torso.ori = Quaternion::rotation_y(0.25 + wavecos * 0.1);
+        next.torso.offset = Vec3::new(-0.5, 0.0, 0.2);
+        next.torso.ori = Quaternion::rotation_x(-0.25 - wavecos * 0.1);
         next.torso.scale = Vec3::one() / 11.0;
 
         next.l_shoulder.offset = Vec3::new(3.0, 6.0, 18.0);
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index 4e600e3ff6..f5e74cf124 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -1,6 +1,6 @@
 use crate::{
     anim::{
-        character::{CharacterSkeleton, IdleAnimation, RunAnimation},
+        character::{CharacterSkeleton, IdleAnimation, RunAnimation, JumpAnimation},
         Animation, Skeleton,
     },
     mesh::Meshable,
@@ -110,7 +110,7 @@ impl FigureCache {
             match head {
                 Head::DefaultHead => "head.vox",
             },
-            Vec3::new(-7.5, -8.0, 0.0),
+            Vec3::new(-7.0, -5.5, -6.0),
         )
     }
 
@@ -119,7 +119,7 @@ impl FigureCache {
             match chest {
                 Chest::DefaultChest => "chest.vox",
             },
-            Vec3::new(-2.5, -6.0, 0.0),
+            Vec3::new(-6.0, -3.5, 0.0),
         )
     }
 
@@ -128,7 +128,7 @@ impl FigureCache {
             match belt {
                 Belt::DefaultBelt => "belt.vox",
             },
-            Vec3::new(-2.5, -5.0, 0.0),
+            Vec3::new(-5.0, -3.5, 0.0),
         )
     }
 
@@ -137,7 +137,7 @@ impl FigureCache {
             match pants {
                 Pants::DefaultPants => "pants.vox",
             },
-            Vec3::new(-2.5, -5.0, 0.0),
+            Vec3::new(-5.0, -3.5, 0.0),
         )
     }
 
@@ -146,7 +146,7 @@ impl FigureCache {
             match hand {
                 Hand::DefaultHand => "hand.vox",
             },
-            Vec3::new(0.0, -2.0, -7.0),
+            Vec3::new(3.5, 0.0, -7.0),
         )
     }
 
@@ -155,7 +155,7 @@ impl FigureCache {
             match hand {
                 Hand::DefaultHand => "hand.vox",
             },
-            Vec3::new(0.0, -2.0, -7.0),
+            Vec3::new(3.5, 0.0, -7.0),
         )
     }
 
@@ -164,7 +164,7 @@ impl FigureCache {
             match foot {
                 Foot::DefaultFoot => "foot.vox",
             },
-            Vec3::new(-3.5, -2.5, -8.0),
+            Vec3::new(2.5, -3.5, -9.0),
         )
     }
 
@@ -173,7 +173,7 @@ impl FigureCache {
             match foot {
                 Foot::DefaultFoot => "foot.vox",
             },
-            Vec3::new(-3.5, -2.5, -8.0),
+            Vec3::new(2.5, -3.5, -9.0),
         )
     }
 
@@ -213,10 +213,10 @@ impl FigureCache {
                     RunAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
                 },
                 comp::character::Animation::Jump => {
+                    JumpAnimation::update_skeleton(&mut state.skeleton, time,  animation_history.time)
+                },
                     // TODO
                     // JumpAnimation::update_skeleton(&mut state.skeleton, time)
-                    state.skeleton.clone()
-                },
             };
 
             state.skeleton.interpolate(&target_skeleton);
@@ -267,7 +267,7 @@ impl<S: Skeleton> FigureState<S> {
     fn update(&mut self, renderer: &mut Renderer, pos: Vec3<f32>, dir: Vec3<f32>) {
         let mat = Mat4::<f32>::identity()
             * Mat4::translation_3d(pos)
-            * Mat4::rotation_z(-dir.x.atan2(dir.y) + f32::consts::PI / 2.0);
+            * Mat4::rotation_z(-dir.x.atan2(dir.y));// + f32::consts::PI / 2.0);
 
         let locals = FigureLocals::new(mat);
         renderer.update_consts(&mut self.locals, &[locals]).unwrap();
diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs
index 364646ac24..ee958bb86c 100644
--- a/voxygen/src/singleplayer.rs
+++ b/voxygen/src/singleplayer.rs
@@ -26,7 +26,7 @@ impl Singleplayer {
     pub fn new() -> (Self, SocketAddr) {
         let (sender, reciever) = channel();
 
-        let sock = SocketAddr::from(([0; 4], pick_unused_port()
+        let sock = SocketAddr::from(([127,0,0,1], pick_unused_port()
             .expect("Failed to find unused port")));
 
         let sock2 = sock.clone();

From 1e1b005cbb996b8fb7b7eef52a0e5b6ebef56a5a Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 9 May 2019 13:52:11 +0100
Subject: [PATCH 18/22] Post-processing tests

Former-commit-id: 133d737a58d9de4fa0b41268cc2f88d2427d3637
---
 voxygen/shaders/postprocess.frag | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/voxygen/shaders/postprocess.frag b/voxygen/shaders/postprocess.frag
index 2b5dab93f8..2731e84abc 100644
--- a/voxygen/shaders/postprocess.frag
+++ b/voxygen/shaders/postprocess.frag
@@ -156,7 +156,16 @@ vec4 fxaa_apply(sampler2D tex, vec2 fragCoord, vec2 resolution) {
 
 void main() {
 	vec2 uv = (f_pos + 1.0) * 0.5;
+
+	/*
+	float px_size = 8.0;
+	vec2 px_count = screen_res.xy / px_size;
+	vec2 uv2 = floor(uv * px_count) / px_count;
+	*/
+
 	vec4 color = fxaa_apply(src_color, uv * screen_res.xy, screen_res.xy);
 
 	tgt_color = 1.0 - 1.0 / (color + 1.0);
+
+	//tgt_color = ceil(tgt_color * 10.0) / 10.0;
 }

From 94fd0b1a22bda8d7fe22233c5865d9cacd0487bf Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 9 May 2019 16:15:46 +0100
Subject: [PATCH 19/22] Fixed running animation, changed movement physics

Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
---
 common/src/sys/control.rs          | 4 ++--
 common/src/sys/phys.rs             | 4 ++--
 voxygen/src/anim/character/idle.rs | 8 ++++----
 voxygen/src/anim/character/jump.rs | 4 ++--
 voxygen/src/anim/character/run.rs  | 8 ++++----
 voxygen/src/scene/figure.rs        | 7 +++----
 world/src/lib.rs                   | 2 +-
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/common/src/sys/control.rs b/common/src/sys/control.rs
index f0ae77a610..e29b1827d1 100644
--- a/common/src/sys/control.rs
+++ b/common/src/sys/control.rs
@@ -40,7 +40,7 @@ impl<'a> System<'a> for Sys {
             if on_ground {
                 // TODO: Don't hard-code this
                 // Apply physics to the player: acceleration and non-linear decceleration
-                vel.0 += control.move_dir * 2.0 - vel.0.map(|e| e * e.abs() + e) * 0.03;
+                vel.0 += control.move_dir * 4.0 - vel.0.map(|e| e * e.abs() + e) * 0.05;
 
                 if control.jumping {
                     vel.0.z += 16.0;
@@ -48,7 +48,7 @@ impl<'a> System<'a> for Sys {
             } else {
                 // TODO: Don't hard-code this
                 // Apply physics to the player: acceleration and non-linear decceleration
-                vel.0 += control.move_dir * 0.2;
+                vel.0 += control.move_dir * 0.2 - vel.0.map(|e| e * e.abs() + e) * 0.002;
             }
 
             let animation = if on_ground {
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index 377b7c59b9..0de3578576 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -34,9 +34,9 @@ impl<'a> System<'a> for Sys {
                 .get(pos.0.map(|e| e.floor() as i32))
                 .map(|vox| !vox.is_empty())
                 .unwrap_or(false)
-                && i < 80
+                && i < 100
             {
-                pos.0.z += 0.005;
+                pos.0.z += 0.0025;
                 vel.0.z = 0.0;
                 i += 1;
             }
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index fe793d736d..1792447ecc 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -42,7 +42,7 @@ impl Animation for IdleAnimation {
 
         next.l_hand.offset = Vec3::new(
             -7.5, -2.0 + waveultracos_slow * 0.3,
-            
+
             12.0 + waveultra_slow * 1.1,
         );
         next.l_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
@@ -50,7 +50,7 @@ impl Animation for IdleAnimation {
 
         next.r_hand.offset = Vec3::new(
             7.5, -2.0 + waveultracos_slow * 0.3,
-            
+
             12.0 + waveultra_slow * 1.1,
         );
         next.r_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
@@ -68,7 +68,7 @@ impl Animation for IdleAnimation {
         next.weapon.ori = Quaternion::rotation_y(2.5);
         next.weapon.scale = Vec3::one();
 
-        next.torso.offset = Vec3::new(-0.5, 0.0, 0.1);
+        next.torso.offset = Vec3::new(-0.5, -0.2, 0.1);
         next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0;
 
@@ -82,4 +82,4 @@ impl Animation for IdleAnimation {
 
         next
     }
-}
\ No newline at end of file
+}
diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs
index eb51a583a7..139c26c662 100644
--- a/voxygen/src/anim/character/jump.rs
+++ b/voxygen/src/anim/character/jump.rs
@@ -16,12 +16,12 @@ impl Animation for JumpAnimation {
 
     fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
-        let wave = (anim_time as f32 * 14.0).sin();        
+        let wave = (anim_time as f32 * 14.0).sin();
         let arcwave = (1.0f32.ln_1p() - 1.0).abs();
         let wavetest = (wave.cbrt());
         let fuzzwave = (anim_time as f32 * 12.0).sin();
         let wavecos = (anim_time as f32 * 14.0).cos();
-        let wave_slow = (anim_time as f32 * 5.0 + PI).sin();
+        let wave_slow = (anim_time as f32 * 5.0 + PI).min(PI / 2.0).sin();
         let wave_slowtest = (anim_time as f32).min(PI/2.0).sin();
         let wavecos_slow = (anim_time as f32 * 8.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index 07bb32737f..66d2e3e763 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -11,9 +11,9 @@ pub struct RunAnimation;
 
 impl Animation for RunAnimation {
     type Skeleton = CharacterSkeleton;
-    type Dependency = f64;
+    type Dependency = (f32, f64);
 
-    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
+    fn update_skeleton(skeleton: &Self::Skeleton, (velocity, global_time): Self::Dependency, anim_time: f64) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
         let wave = (anim_time as f32 * 14.0).sin();
@@ -60,8 +60,8 @@ impl Animation for RunAnimation {
         next.weapon.ori = Quaternion::rotation_y(2.5);
         next.weapon.scale = Vec3::one();
 
-        next.torso.offset = Vec3::new(-0.5, 0.0, 0.2);
-        next.torso.ori = Quaternion::rotation_x(-0.25 - wavecos * 0.1);
+        next.torso.offset = Vec3::new(-0.5, -0.2, 0.2);
+        next.torso.ori = Quaternion::rotation_x( - velocity * 0.05 - wavecos * 0.1);
         next.torso.scale = Vec3::one() / 11.0;
 
         next.l_shoulder.offset = Vec3::new(3.0, 6.0, 18.0);
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index f5e74cf124..56188598c7 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -191,9 +191,10 @@ impl FigureCache {
     pub fn maintain(&mut self, renderer: &mut Renderer, client: &mut Client) {
         let time = client.state().get_time();
         let ecs = client.state_mut().ecs_mut();
-        for (entity, pos, dir, character, animation_history) in (
+        for (entity, pos, vel, dir, character, animation_history) in (
             &ecs.entities(),
             &ecs.read_storage::<comp::phys::Pos>(),
+            &ecs.read_storage::<comp::phys::Vel>(),
             &ecs.read_storage::<comp::phys::Dir>(),
             &ecs.read_storage::<comp::Character>(),
             &ecs.read_storage::<comp::AnimationHistory>(),
@@ -210,13 +211,11 @@ impl FigureCache {
                     IdleAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
                 },
                 comp::character::Animation::Run => {
-                    RunAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
+                    RunAnimation::update_skeleton(&mut state.skeleton, (vel.0.magnitude(), time), animation_history.time)
                 },
                 comp::character::Animation::Jump => {
                     JumpAnimation::update_skeleton(&mut state.skeleton, time,  animation_history.time)
                 },
-                    // TODO
-                    // JumpAnimation::update_skeleton(&mut state.skeleton, time)
             };
 
             state.skeleton.interpolate(&target_skeleton);
diff --git a/world/src/lib.rs b/world/src/lib.rs
index a4ea59cfaa..745da01485 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -53,7 +53,7 @@ impl World {
             let chaos = chaos_nz.get(Vec2::from(wposf * chaos_freq).into_array()).max(0.0) + 0.5;
 
             let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl * chaos
-                + perlin_nz.get(Vec2::from(wposf * small_freq).into_array()) * small_ampl * chaos
+                + perlin_nz.get((wposf * small_freq).into_array()) * small_ampl * chaos
                 + offs;
             let temp = (temp_nz.get(Vec2::from(wposf * (1.0 / 64.0)).into_array()) + 1.0) * 0.5;
 

From cf4e02252a20325c79ba9173ad6218d38a052b30 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 9 May 2019 18:12:24 +0100
Subject: [PATCH 20/22] Smartened up terrain generation

Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
---
 common/src/sys/control.rs |  2 +-
 voxygen/src/key_state.rs  | 10 ++++++++--
 world/src/lib.rs          |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/src/sys/control.rs b/common/src/sys/control.rs
index e29b1827d1..49da445e8d 100644
--- a/common/src/sys/control.rs
+++ b/common/src/sys/control.rs
@@ -40,7 +40,7 @@ impl<'a> System<'a> for Sys {
             if on_ground {
                 // TODO: Don't hard-code this
                 // Apply physics to the player: acceleration and non-linear decceleration
-                vel.0 += control.move_dir * 4.0 - vel.0.map(|e| e * e.abs() + e) * 0.05;
+                vel.0 += control.move_dir * 4.0 - vel.0.map(|e| e * vel.0.magnitude() + e) * 0.05;
 
                 if control.jumping {
                     vel.0.z += 16.0;
diff --git a/voxygen/src/key_state.rs b/voxygen/src/key_state.rs
index 3e97fe7d4a..22e666f0ba 100644
--- a/voxygen/src/key_state.rs
+++ b/voxygen/src/key_state.rs
@@ -20,9 +20,15 @@ impl KeyState {
     }
 
     pub fn dir_vec(&self) -> Vec2<f32> {
-        Vec2::<f32>::new(
+        let dir = Vec2::<f32>::new(
             if self.right { 1.0 } else { 0.0 } + if self.left { -1.0 } else { 0.0 },
             if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
-        )
+        );
+
+        if dir.magnitude_squared() == 0.0 {
+            dir
+        } else {
+            dir.normalized()
+        }
     }
 }
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 745da01485..77b4f3678b 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -53,7 +53,7 @@ impl World {
             let chaos = chaos_nz.get(Vec2::from(wposf * chaos_freq).into_array()).max(0.0) + 0.5;
 
             let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl * chaos
-                + perlin_nz.get((wposf * small_freq).into_array()) * small_ampl * chaos
+                + perlin_nz.get((wposf * small_freq).into_array()) * small_ampl * 2.0 * chaos.powf(2.0)
                 + offs;
             let temp = (temp_nz.get(Vec2::from(wposf * (1.0 / 64.0)).into_array()) + 1.0) * 0.5;
 
@@ -62,7 +62,7 @@ impl World {
                     lpos,
                     if wposf.z < height - 4.0 {
                         stone
-                    } else if wposf.z < height - 1.0 {
+                    } else if wposf.z < height - 2.0 {
                         dirt
                     } else if wposf.z < height {
                         Block::new(2, Rgb::new(10 + (150.0 * temp) as u8, 150, 0))

From 3b44bda43c1832d6cc969963b60c981c48d17da1 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 9 May 2019 18:57:43 +0100
Subject: [PATCH 21/22] Secret feature

Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
---
 common/src/net/post2.rs            |  2 ++
 voxygen/src/anim/character/idle.rs | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index f7e1ca561e..9d002f5107 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -196,9 +196,11 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                             let msg_bytes = bincode::serialize(&send_msg).unwrap();
                             let mut msg_bytes = lz4_compress::compress(&msg_bytes);
 
+                            /*
                             if msg_bytes.len() > 512 {
                                 println!("MSG SIZE: {}", msg_bytes.len());
                             }
+                            */
 
                             // Assemble into packet
                             let mut packet_bytes = msg_bytes
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index 1792447ecc..876efee6b1 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -1,5 +1,8 @@
 // Standard
-use std::f32::consts::PI;
+use std::{
+    f32::consts::PI,
+    ops::Mul,
+};
 
 // Library
 use vek::*;
@@ -24,8 +27,12 @@ impl Animation for IdleAnimation {
         let waveultracos_slow = (anim_time as f32 * 1.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
+        let head_look = Vec2::new(
+            (global_time as f32 / 5.0).floor().mul(7331.0).sin() * 0.5,
+            (global_time as f32 / 5.0).floor().mul(1337.0).sin() * 0.25,
+        );
         next.head.offset = Vec3::new(5.5, 2.0, 11.5 + waveultra_slow * 0.4);
-        next.head.ori = Quaternion::rotation_x(waveultra_slow * 0.05);
+        next.head.ori = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x(head_look.y);
         next.head.scale = Vec3::one();
 
         next.chest.offset = Vec3::new(5.5, 0.0, 7.5 + waveultra_slow * 0.4);
@@ -57,11 +64,11 @@ impl Animation for IdleAnimation {
         next.r_hand.scale = Vec3::one();
 
         next.l_foot.offset = Vec3::new(-3.4, 0.0, 8.0);
-        next.l_foot.ori = Quaternion::rotation_x(-0.04 - waveultra_slow * 0.04);
+        next.l_foot.ori = Quaternion::identity();
         next.l_foot.scale = Vec3::one();
 
         next.r_foot.offset = Vec3::new(3.4, 0.0, 8.0);
-        next.r_foot.ori = Quaternion::rotation_x(-0.04 - waveultra_slow * 0.04);
+        next.r_foot.ori = Quaternion::identity();
         next.r_foot.scale = Vec3::one();
 
         next.weapon.offset = Vec3::new(-5.0, -6.0, 18.5);

From 54cc9e137aec8e6be3195c1be33d86502f98b721 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 9 May 2019 18:58:16 +0100
Subject: [PATCH 22/22] fmt

Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
---
 client/src/lib.rs                           | 11 ++++++--
 common/src/net/post2.rs                     | 23 ++++++++-------
 common/src/sys/control.rs                   | 16 +++++++----
 server/src/lib.rs                           | 30 +++++++++-----------
 voxygen/src/anim/character/idle.rs          | 19 +++++++------
 voxygen/src/anim/character/jump.rs          |  8 ++++--
 voxygen/src/anim/character/mod.rs           |  4 +--
 voxygen/src/anim/character/run.rs           |  8 ++++--
 voxygen/src/anim/mod.rs                     |  6 +++-
 voxygen/src/menu/main/client_init.rs        |  8 ++++--
 voxygen/src/menu/main/start_singleplayer.rs | 15 ++++------
 voxygen/src/render/pipelines/postprocess.rs |  2 +-
 voxygen/src/render/pipelines/ui.rs          |  2 +-
 voxygen/src/scene/figure.rs                 | 28 +++++++++++--------
 voxygen/src/session.rs                      | 31 +++++++--------------
 voxygen/src/singleplayer.rs                 | 31 ++++++++++++---------
 world/src/lib.rs                            | 19 +++++++------
 17 files changed, 144 insertions(+), 117 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 7c7c30abb0..b3de584492 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -4,7 +4,10 @@ pub mod error;
 pub mod input;
 
 // Reexports
-pub use crate::{error::Error, input::{Input, InputEvent}};
+pub use crate::{
+    error::Error,
+    input::{Input, InputEvent},
+};
 pub use specs::join::Join;
 pub use specs::Entity as EcsEntity;
 
@@ -196,7 +199,11 @@ impl Client {
             // Remove chunks that are too far from the player
             let mut chunks_to_remove = Vec::new();
             self.state.terrain().iter().for_each(|(key, _)| {
-                if (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max() > 6 {
+                if (Vec2::from(chunk_pos) - Vec2::from(key))
+                    .map(|e: i32| e.abs())
+                    .reduce_max()
+                    > 6
+                {
                     chunks_to_remove.push(key);
                 }
             });
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index 9d002f5107..ea466ac8bb 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -203,11 +203,7 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                             */
 
                             // Assemble into packet
-                            let mut packet_bytes = msg_bytes
-                                .len()
-                                .to_le_bytes()
-                                .as_ref()
-                                .to_vec();
+                            let mut packet_bytes = msg_bytes.len().to_le_bytes().as_ref().to_vec();
                             packet_bytes.push(msg_bytes.iter().fold(0, |a, x| a ^ *x));
                             packet_bytes.append(&mut msg_bytes);
 
@@ -270,25 +266,32 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
                 for _ in 0..100 {
                     match incoming_buf.get(0..9) {
                         Some(len_bytes) => {
-                            let len = usize::from_le_bytes(<[u8; 8]>::try_from(&len_bytes[0..8]).unwrap()); // Can't fail
+                            let len = usize::from_le_bytes(
+                                <[u8; 8]>::try_from(&len_bytes[0..8]).unwrap(),
+                            ); // Can't fail
 
                             if len > MAX_MSG_SIZE {
                                 recv_tx.send(Err(Error::InvalidMessage)).unwrap();
                                 break 'work;
                             } else if incoming_buf.len() >= len + 9 {
-                                let checksum_found = incoming_buf[9..len + 9].iter().fold(0, |a, x| a ^ *x);
+                                let checksum_found =
+                                    incoming_buf[9..len + 9].iter().fold(0, |a, x| a ^ *x);
                                 let checksum_expected = len_bytes[8];
 
-                                assert_eq!(checksum_found, checksum_expected, "Message checksum failed!");
+                                assert_eq!(
+                                    checksum_found, checksum_expected,
+                                    "Message checksum failed!"
+                                );
 
-                                let msg_bytes = lz4_compress::decompress(&incoming_buf[9..len + 9]).unwrap();
+                                let msg_bytes =
+                                    lz4_compress::decompress(&incoming_buf[9..len + 9]).unwrap();
 
                                 match bincode::deserialize(&msg_bytes) {
                                     Ok(msg) => recv_tx.send(Ok(msg)).unwrap(),
                                     Err(err) => {
                                         println!("BINCODE ERROR: {:?}", err);
                                         recv_tx.send(Err(err.into())).unwrap()
-                                    },
+                                    }
                                 }
 
                                 incoming_buf = incoming_buf.split_off(len + 9);
diff --git a/common/src/sys/control.rs b/common/src/sys/control.rs
index 49da445e8d..0b3667322e 100644
--- a/common/src/sys/control.rs
+++ b/common/src/sys/control.rs
@@ -1,5 +1,5 @@
 // Library
-use specs::{Entities, Join, Read, ReadStorage, ReadExpect, System, WriteStorage};
+use specs::{Entities, Join, Read, ReadExpect, ReadStorage, System, WriteStorage};
 use vek::*;
 
 // Crate
@@ -8,9 +8,9 @@ use crate::{
         phys::{Dir, Pos, Vel},
         Animation, AnimationHistory, Control,
     },
+    state::DeltaTime,
     terrain::TerrainMap,
     vol::{ReadVol, Vox},
-    state::DeltaTime,
 };
 
 // Basic ECS AI agent system
@@ -28,14 +28,18 @@ impl<'a> System<'a> for Sys {
         ReadStorage<'a, Control>,
     );
 
-    fn run(&mut self, (terrain, dt, entities, pos, mut vels, mut dirs, mut anims, controls): Self::SystemData) {
+    fn run(
+        &mut self,
+        (terrain, dt, entities, pos, mut vels, mut dirs, mut anims, controls): Self::SystemData,
+    ) {
         for (entity, pos, mut vel, mut dir, control) in
             (&entities, &pos, &mut vels, &mut dirs, &controls).join()
         {
             let on_ground = terrain
                 .get((pos.0 - Vec3::unit_z() * 0.1).map(|e| e.floor() as i32))
                 .map(|vox| !vox.is_empty())
-                .unwrap_or(false) && vel.0.z <= 0.0;
+                .unwrap_or(false)
+                && vel.0.z <= 0.0;
 
             if on_ground {
                 // TODO: Don't hard-code this
@@ -64,8 +68,8 @@ impl<'a> System<'a> for Sys {
 
             let last_history = anims.get_mut(entity).cloned();
 
-            let time = if let Some((true, time)) = last_history
-                .map(|last| (last.current == animation, last.time))
+            let time = if let Some((true, time)) =
+                last_history.map(|last| (last.current == animation, last.time))
             {
                 time + dt.0 as f64
             } else {
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 9ea247aaad..830337bc60 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -8,19 +8,10 @@ pub mod input;
 // Reexports
 pub use crate::{error::Error, input::Input};
 
-use std::{
-    collections::HashSet,
-    net::SocketAddr,
-    sync::mpsc,
-    time::Duration,
-    i32,
+use crate::{
+    client::{Client, Clients},
+    cmd::CHAT_COMMANDS,
 };
-use specs::{
-    join::Join, saveload::MarkedBuilder, world::EntityBuilder as EcsEntityBuilder, Builder,
-    Entity as EcsEntity,
-};
-use threadpool::ThreadPool;
-use vek::*;
 use common::{
     comp,
     comp::character::Animation,
@@ -29,11 +20,14 @@ use common::{
     state::{State, Uid},
     terrain::TerrainChunk,
 };
-use world::World;
-use crate::{
-    client::{Client, Clients},
-    cmd::CHAT_COMMANDS,
+use specs::{
+    join::Join, saveload::MarkedBuilder, world::EntityBuilder as EcsEntityBuilder, Builder,
+    Entity as EcsEntity,
 };
+use std::{collections::HashSet, i32, net::SocketAddr, sync::mpsc, time::Duration};
+use threadpool::ThreadPool;
+use vek::*;
+use world::World;
 
 const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
 
@@ -204,7 +198,9 @@ impl Server {
                 .join()
             {
                 let chunk_pos = self.state.terrain().pos_key(pos.0.map(|e| e as i32));
-                let dist = (Vec2::from(chunk_pos) - Vec2::from(key)).map(|e: i32| e.abs()).reduce_max();
+                let dist = (Vec2::from(chunk_pos) - Vec2::from(key))
+                    .map(|e: i32| e.abs())
+                    .reduce_max();
 
                 if dist < 5 {
                     self.clients.notify(
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index 876efee6b1..bb76bd62de 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -1,8 +1,5 @@
 // Standard
-use std::{
-    f32::consts::PI,
-    ops::Mul,
-};
+use std::{f32::consts::PI, ops::Mul};
 
 // Library
 use vek::*;
@@ -16,7 +13,11 @@ impl Animation for IdleAnimation {
     type Skeleton = CharacterSkeleton;
     type Dependency = f64;
 
-    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
+    fn update_skeleton(
+        skeleton: &Self::Skeleton,
+        global_time: f64,
+        anim_time: f64,
+    ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
         let wave = (anim_time as f32 * 12.0).sin();
@@ -48,16 +49,16 @@ impl Animation for IdleAnimation {
         next.shorts.scale = Vec3::one();
 
         next.l_hand.offset = Vec3::new(
-            -7.5, -2.0 + waveultracos_slow * 0.3,
-
+            -7.5,
+            -2.0 + waveultracos_slow * 0.3,
             12.0 + waveultra_slow * 1.1,
         );
         next.l_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
         next.l_hand.scale = Vec3::one();
 
         next.r_hand.offset = Vec3::new(
-            7.5, -2.0 + waveultracos_slow * 0.3,
-
+            7.5,
+            -2.0 + waveultracos_slow * 0.3,
             12.0 + waveultra_slow * 1.1,
         );
         next.r_hand.ori = Quaternion::rotation_x(0.0 + waveultra_slow * 0.06);
diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs
index 139c26c662..b966bce36e 100644
--- a/voxygen/src/anim/character/jump.rs
+++ b/voxygen/src/anim/character/jump.rs
@@ -14,7 +14,11 @@ impl Animation for JumpAnimation {
     type Skeleton = CharacterSkeleton;
     type Dependency = f64;
 
-    fn update_skeleton(skeleton: &Self::Skeleton, global_time: f64, anim_time: f64) -> Self::Skeleton {
+    fn update_skeleton(
+        skeleton: &Self::Skeleton,
+        global_time: f64,
+        anim_time: f64,
+    ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
         let wave = (anim_time as f32 * 14.0).sin();
         let arcwave = (1.0f32.ln_1p() - 1.0).abs();
@@ -22,7 +26,7 @@ impl Animation for JumpAnimation {
         let fuzzwave = (anim_time as f32 * 12.0).sin();
         let wavecos = (anim_time as f32 * 14.0).cos();
         let wave_slow = (anim_time as f32 * 5.0 + PI).min(PI / 2.0).sin();
-        let wave_slowtest = (anim_time as f32).min(PI/2.0).sin();
+        let wave_slowtest = (anim_time as f32).min(PI / 2.0).sin();
         let wavecos_slow = (anim_time as f32 * 8.0 + PI).cos();
         let wave_dip = (wave_slow.abs() - 0.5).abs();
         let mult = wave_slow / (wave_slow.abs());
diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index 26083a4184..8671f5ca10 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -1,11 +1,11 @@
 pub mod idle;
-pub mod run;
 pub mod jump;
+pub mod run;
 
 // Reexports
 pub use self::idle::IdleAnimation;
-pub use self::run::RunAnimation;
 pub use self::jump::JumpAnimation;
+pub use self::run::RunAnimation;
 // Crate
 use crate::render::FigureBoneData;
 
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index 66d2e3e763..e6f2f6a8c0 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -13,7 +13,11 @@ impl Animation for RunAnimation {
     type Skeleton = CharacterSkeleton;
     type Dependency = (f32, f64);
 
-    fn update_skeleton(skeleton: &Self::Skeleton, (velocity, global_time): Self::Dependency, anim_time: f64) -> Self::Skeleton {
+    fn update_skeleton(
+        skeleton: &Self::Skeleton,
+        (velocity, global_time): Self::Dependency,
+        anim_time: f64,
+    ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
         let wave = (anim_time as f32 * 14.0).sin();
@@ -61,7 +65,7 @@ impl Animation for RunAnimation {
         next.weapon.scale = Vec3::one();
 
         next.torso.offset = Vec3::new(-0.5, -0.2, 0.2);
-        next.torso.ori = Quaternion::rotation_x( - velocity * 0.05 - wavecos * 0.1);
+        next.torso.ori = Quaternion::rotation_x(-velocity * 0.05 - wavecos * 0.1);
         next.torso.scale = Vec3::one() / 11.0;
 
         next.l_shoulder.offset = Vec3::new(3.0, 6.0, 18.0);
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
index 83b8173194..38452e6c65 100644
--- a/voxygen/src/anim/mod.rs
+++ b/voxygen/src/anim/mod.rs
@@ -50,5 +50,9 @@ pub trait Animation {
     type Dependency;
 
     /// Returns a new skeleton that is generated by the animation
-    fn update_skeleton(skeleton: &Self::Skeleton, dependency: Self::Dependency, anim_time: f64) -> Self::Skeleton;
+    fn update_skeleton(
+        skeleton: &Self::Skeleton,
+        dependency: Self::Dependency,
+        anim_time: f64,
+    ) -> Self::Skeleton;
 }
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 239d7646bd..2781bd9662 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -1,9 +1,9 @@
 use client::{error::Error as ClientError, Client};
 use common::comp;
 use std::{
+    net::ToSocketAddrs,
     sync::mpsc::{channel, Receiver, TryRecvError},
     thread::{self, JoinHandle},
-    net::ToSocketAddrs,
     time::Duration,
 };
 
@@ -23,7 +23,11 @@ pub struct ClientInit {
     rx: Receiver<Result<Client, Error>>,
 }
 impl ClientInit {
-    pub fn new(connection_args: (String, u16, bool), client_args: (comp::Player, u64), wait: bool) -> Self {
+    pub fn new(
+        connection_args: (String, u16, bool),
+        client_args: (comp::Player, u64),
+        wait: bool,
+    ) -> Self {
         let (server_address, default_port, prefer_ipv6) = connection_args;
         let (player, view_distance) = client_args;
 
diff --git a/voxygen/src/menu/main/start_singleplayer.rs b/voxygen/src/menu/main/start_singleplayer.rs
index 841d876205..3e6e449540 100644
--- a/voxygen/src/menu/main/start_singleplayer.rs
+++ b/voxygen/src/menu/main/start_singleplayer.rs
@@ -1,11 +1,11 @@
-use std::net::SocketAddr;
-use log::warn;
-use common::comp;
+use super::{client_init::ClientInit, DEFAULT_PORT};
 use crate::{
     menu::char_selection::CharSelectionState, singleplayer::Singleplayer, Direction, GlobalState,
     PlayState, PlayStateResult,
 };
-use super::{client_init::ClientInit, DEFAULT_PORT};
+use common::comp;
+use log::warn;
+use std::net::SocketAddr;
 
 pub struct StartSingleplayerState {
     singleplayer: Singleplayer,
@@ -17,10 +17,7 @@ impl StartSingleplayerState {
     pub fn new() -> Self {
         let (singleplayer, sock) = Singleplayer::new();
 
-        Self {
-            singleplayer,
-            sock,
-        }
+        Self { singleplayer, sock }
     }
 }
 
@@ -45,7 +42,7 @@ impl PlayState for StartSingleplayerState {
                         Some(Err(err)) => {
                             warn!("Failed to start singleplayer server: {:?}", err);
                             return PlayStateResult::Pop;
-                        },
+                        }
                         _ => {}
                     }
                 };
diff --git a/voxygen/src/render/pipelines/postprocess.rs b/voxygen/src/render/pipelines/postprocess.rs
index d9b341a7f7..34cebebaf8 100644
--- a/voxygen/src/render/pipelines/postprocess.rs
+++ b/voxygen/src/render/pipelines/postprocess.rs
@@ -12,7 +12,7 @@ use gfx::{
 
 // Local
 use super::{
-    super::{Mesh, Pipeline, WinColorFmt, WinDepthFmt, Tri},
+    super::{Mesh, Pipeline, Tri, WinColorFmt, WinDepthFmt},
     Globals,
 };
 
diff --git a/voxygen/src/render/pipelines/ui.rs b/voxygen/src/render/pipelines/ui.rs
index f8758418a3..2ebbcc3bcf 100644
--- a/voxygen/src/render/pipelines/ui.rs
+++ b/voxygen/src/render/pipelines/ui.rs
@@ -1,4 +1,4 @@
-use super::super::{Pipeline, Quad, WinColorFmt, WinDepthFmt, Tri};
+use super::super::{Pipeline, Quad, Tri, WinColorFmt, WinDepthFmt};
 use gfx::{
     self,
     // Macros
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index 56188598c7..b9763f6731 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -1,6 +1,6 @@
 use crate::{
     anim::{
-        character::{CharacterSkeleton, IdleAnimation, RunAnimation, JumpAnimation},
+        character::{CharacterSkeleton, IdleAnimation, JumpAnimation, RunAnimation},
         Animation, Skeleton,
     },
     mesh::Meshable,
@@ -207,15 +207,21 @@ impl FigureCache {
                 .or_insert_with(|| FigureState::new(renderer, CharacterSkeleton::new()));
 
             let target_skeleton = match animation_history.current {
-                comp::character::Animation::Idle => {
-                    IdleAnimation::update_skeleton(&mut state.skeleton, time, animation_history.time)
-                },
-                comp::character::Animation::Run => {
-                    RunAnimation::update_skeleton(&mut state.skeleton, (vel.0.magnitude(), time), animation_history.time)
-                },
-                comp::character::Animation::Jump => {
-                    JumpAnimation::update_skeleton(&mut state.skeleton, time,  animation_history.time)
-                },
+                comp::character::Animation::Idle => IdleAnimation::update_skeleton(
+                    &mut state.skeleton,
+                    time,
+                    animation_history.time,
+                ),
+                comp::character::Animation::Run => RunAnimation::update_skeleton(
+                    &mut state.skeleton,
+                    (vel.0.magnitude(), time),
+                    animation_history.time,
+                ),
+                comp::character::Animation::Jump => JumpAnimation::update_skeleton(
+                    &mut state.skeleton,
+                    time,
+                    animation_history.time,
+                ),
             };
 
             state.skeleton.interpolate(&target_skeleton);
@@ -266,7 +272,7 @@ impl<S: Skeleton> FigureState<S> {
     fn update(&mut self, renderer: &mut Renderer, pos: Vec3<f32>, dir: Vec3<f32>) {
         let mat = Mat4::<f32>::identity()
             * Mat4::translation_3d(pos)
-            * Mat4::rotation_z(-dir.x.atan2(dir.y));// + f32::consts::PI / 2.0);
+            * Mat4::rotation_z(-dir.x.atan2(dir.y)); // + f32::consts::PI / 2.0);
 
         let locals = FigureLocals::new(mat);
         renderer.update_consts(&mut self.locals, &[locals]).unwrap();
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 9a93f05c91..b66d036118 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -1,17 +1,3 @@
-use std::{
-    cell::RefCell,
-    rc::Rc,
-    time::Duration,
-    mem,
-};
-use vek::*;
-use common::clock::Clock;
-use client::{
-    self,
-    Client,
-    Input,
-    InputEvent,
-};
 use crate::{
     hud::{Event as HudEvent, Hud},
     key_state::KeyState,
@@ -21,6 +7,10 @@ use crate::{
     window::{Event, Key, Window},
     Direction, Error, GlobalState, PlayState, PlayStateResult,
 };
+use client::{self, Client, Input, InputEvent};
+use common::clock::Clock;
+use std::{cell::RefCell, mem, rc::Rc, time::Duration};
+use vek::*;
 
 const FPS: u64 = 60;
 
@@ -72,15 +62,14 @@ impl SessionState {
         let mut input_events = Vec::new();
         mem::swap(&mut self.input_events, &mut input_events);
 
-        for event in self
-            .client
-            .borrow_mut()
-            .tick(Input {
+        for event in self.client.borrow_mut().tick(
+            Input {
                 move_dir,
                 jumping: self.key_state.jump,
                 events: input_events,
-            }, dt)?
-        {
+            },
+            dt,
+        )? {
             match event {
                 client::Event::Chat(msg) => {
                     self.hud.new_message(msg);
@@ -155,7 +144,7 @@ impl PlayState for SessionState {
                     Event::KeyDown(Key::Jump) => {
                         self.input_events.push(InputEvent::Jump);
                         self.key_state.jump = true;
-                    },
+                    }
                     // Movement Key Released
                     Event::KeyUp(Key::MoveForward) => self.key_state.up = false,
                     Event::KeyUp(Key::MoveBack) => self.key_state.down = false,
diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs
index ee958bb86c..bb56791f65 100644
--- a/voxygen/src/singleplayer.rs
+++ b/voxygen/src/singleplayer.rs
@@ -1,13 +1,13 @@
-use std::{
-    sync::mpsc::{channel, Receiver, Sender, TryRecvError},
-    time::Duration,
-    thread::{self, JoinHandle},
-    net::SocketAddr,
-};
+use common::clock::Clock;
 use log::info;
 use portpicker::pick_unused_port;
-use common::clock::Clock;
 use server::{Event, Input, Server};
+use std::{
+    net::SocketAddr,
+    sync::mpsc::{channel, Receiver, Sender, TryRecvError},
+    thread::{self, JoinHandle},
+    time::Duration,
+};
 
 const TPS: u64 = 30;
 
@@ -26,18 +26,23 @@ impl Singleplayer {
     pub fn new() -> (Self, SocketAddr) {
         let (sender, reciever) = channel();
 
-        let sock = SocketAddr::from(([127,0,0,1], pick_unused_port()
-            .expect("Failed to find unused port")));
+        let sock = SocketAddr::from((
+            [127, 0, 0, 1],
+            pick_unused_port().expect("Failed to find unused port"),
+        ));
 
         let sock2 = sock.clone();
         let thread = thread::spawn(move || {
             run_server(sock2, reciever);
         });
 
-        (Singleplayer {
-            server_thread: thread,
-            sender,
-        }, sock)
+        (
+            Singleplayer {
+                server_thread: thread,
+                sender,
+            },
+            sock,
+        )
     }
 }
 
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 77b4f3678b..98242c847c 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -32,12 +32,9 @@ impl World {
         let dirt = Block::new(3, Rgb::new(128, 90, 0));
         let sand = Block::new(4, Rgb::new(180, 150, 50));
 
-        let perlin_nz = Perlin::new()
-            .set_seed(1);
-        let temp_nz = Perlin::new()
-            .set_seed(2);
-        let chaos_nz = Perlin::new()
-            .set_seed(3);
+        let perlin_nz = Perlin::new().set_seed(1);
+        let temp_nz = Perlin::new().set_seed(2);
+        let chaos_nz = Perlin::new().set_seed(3);
 
         for lpos in chunk.iter_positions() {
             let wpos = lpos + chunk_pos * chunk.get_size().map(|e| e as i32);
@@ -50,10 +47,16 @@ impl World {
             let small_ampl = 6.0;
             let offs = 32.0;
 
-            let chaos = chaos_nz.get(Vec2::from(wposf * chaos_freq).into_array()).max(0.0) + 0.5;
+            let chaos = chaos_nz
+                .get(Vec2::from(wposf * chaos_freq).into_array())
+                .max(0.0)
+                + 0.5;
 
             let height = perlin_nz.get(Vec2::from(wposf * freq).into_array()) * ampl * chaos
-                + perlin_nz.get((wposf * small_freq).into_array()) * small_ampl * 2.0 * chaos.powf(2.0)
+                + perlin_nz.get((wposf * small_freq).into_array())
+                    * small_ampl
+                    * 2.0
+                    * chaos.powf(2.0)
                 + offs;
             let temp = (temp_nz.get(Vec2::from(wposf * (1.0 / 64.0)).into_array()) + 1.0) * 0.5;