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

.gitlab-ci.yml

@@ -205,6 +205,7 @@ macos:
             - assets/
             - LICENSE
         expire_in: 1 week
+    allow_failure: true
 # --
 
 # -- publish

assets/voxygen/shaders/include/light.glsl

@@ -25,7 +25,7 @@ vec3 illuminate(vec3 color, vec3 light, vec3 diffuse, vec3 ambience) {
 }
 
 float attenuation_strength(vec3 rpos) {
-	return 1.0 / (rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z);
+	return 1.0 / pow(rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z, 0.6);
 }
 
 vec3 light_at(vec3 wpos, vec3 wnorm) {

common/src/path.rs

@@ -218,8 +218,26 @@ where
         ];
 
         DIRS.iter()
-            .map(move |dir| pos + dir)
-            .filter(move |pos| is_walkable(pos))
+            .map(move |dir| (pos, dir))
+            .filter(move |(pos, dir)| {
+                is_walkable(pos)
+                    && ((dir.z < 1
+                        || vol
+                            .get(pos + Vec3::unit_z() * 2)
+                            .map(|b| !b.is_solid())
+                            .unwrap_or(true))
+                        && (dir.z < 2
+                            || vol
+                                .get(pos + Vec3::unit_z() * 3)
+                                .map(|b| !b.is_solid())
+                                .unwrap_or(true))
+                        && (dir.z >= 0
+                            || vol
+                                .get(pos + *dir + Vec3::unit_z() * 2)
+                                .map(|b| !b.is_solid())
+                                .unwrap_or(true)))
+            })
+            .map(move |(pos, dir)| pos + dir)
             .chain(
                 DIAGONALS
                     .iter()

rust-toolchain

@@ -1 +1 @@
-nightly-2020-02-06
+nightly-2020-03-05

server-cli/Dockerfile

@@ -2,7 +2,9 @@ FROM debian:stable-slim
 
 ARG PROJECTNAME=server-cli
 
-COPY ./server-cli/docker-run.sh /opt/docker-run.sh
 COPY ./veloren-server-cli /opt/veloren-server-cli
 COPY ./assets/common /opt/assets/common
 COPY ./assets/world /opt/assets/world
+
+WORKDIR /opt
+CMD [ "sh", "-c", "RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli" ]

server-cli/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.5"
 
 services:
   game-server:
@@ -11,7 +11,14 @@ services:
       update_config:
         parallelism: 2
         delay: 10s
-	order: stop-first
+        order: stop-first
         failure_action: rollback
       restart_policy:
         condition: on-failure
+  watchtower:
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /root/.docker/config.json:/config.json
+    command: --interval 30 --cleanup
+

server-cli/docker-run.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt
-RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli

voxygen/src/main.rs

@@ -125,7 +125,7 @@ fn main() {
             and the events that led up to the panic as possible.
             \n\
             Voxygen has logged information about the problem (including this \
-            message) to the file {:#?}. Please include the contents of this \
+            message) to the file {}. Please include the contents of this \
             file in your bug report.
             \n\
             > Error information\n\
@@ -133,13 +133,17 @@ fn main() {
             The information below is intended for developers and testers.\n\
             \n\
             Panic Payload: {:?}\n\
-            PanicInfo: {}",
-            // TODO: Verify that this works
-            Settings::get_settings_path()
+            PanicInfo: {}\n\
+            Game version: {} [{}]",
+            Settings::load()
+                .log
+                .logs_path
                 .join("voxygen-<date>.log")
                 .display(),
             reason,
             panic_info,
+            common::util::GIT_HASH.to_string(),
+            common::util::GIT_DATE.to_string()
         );
 
         error!(

voxygen/src/session.rs

@@ -379,7 +379,7 @@ impl PlayState for SessionState {
                             )
                                 .join()
                                 .filter(|(_, pos, _)| {
-                                    pos.0.distance_squared(player_pos.0) < 3.0 * 3.0
+                                    pos.0.distance_squared(player_pos.0) < MAX_PICKUP_RANGE_SQR
                                 })
                                 .min_by_key(|(_, pos, _)| {
                                     (pos.0.distance_squared(player_pos.0) * 1000.0) as i32