From 1b9d1dc33391673ad0487a7d941e72dab18efacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Sun, 8 Mar 2020 13:05:38 +0100
Subject: [PATCH 01/10] update toolchain to `nightly-2020-03-05`
---
rust-toolchain | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rust-toolchain b/rust-toolchain
index 47892367f9..be5bcdaf12 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-02-06
+nightly-2020-03-05
From 77d2c2a2538adfd8d1382f3006f78b2f163b2aa9 Mon Sep 17 00:00:00 2001
From: Marcel <marcel.cochem@googlemail.com>
Date: Tue, 10 Mar 2020 22:03:29 +0000
Subject: [PATCH 02/10] temp allow failure in macos
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a93f8de07..a1044fca4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,6 +205,7 @@ macos:
- assets/
- LICENSE
expire_in: 1 week
+ allow_failure: true
# --
# -- publish
From 4e5d200b70b58ecab6ed0716dcef2db2b29a2903 Mon Sep 17 00:00:00 2001
From: Shane Handley <shanehandley@fastmail.com>
Date: Thu, 12 Mar 2020 11:54:23 +0900
Subject: [PATCH 03/10] Fix: Make the dropped item collection range match the
world item range limit.
---
voxygen/src/session.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 52421d3975..7f8ecd2370 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -381,7 +381,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
From 3559252a5e50ad240c6b340eef7987b7aef1389f Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 17 Mar 2020 13:29:42 +0000
Subject: [PATCH 04/10] Nicer point lights
---
assets/voxygen/shaders/include/light.glsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/voxygen/shaders/include/light.glsl b/assets/voxygen/shaders/include/light.glsl
index e937535b78..1496dd2d42 100644
--- a/assets/voxygen/shaders/include/light.glsl
+++ b/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) {
From 4580752e78e467805c86616cdaeabc7c02f62e48 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 17 Mar 2020 14:14:20 +0000
Subject: [PATCH 05/10] Fixed remaining pathfinding issues
---
common/src/path.rs | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/common/src/path.rs b/common/src/path.rs
index 1d21b51819..edce17249e 100644
--- a/common/src/path.rs
+++ b/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()
From 95eeb7e145e2b1cf064ad056d837d97291ebd26e Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 17 Mar 2020 16:37:39 +0000
Subject: [PATCH 06/10] Omitted unnecessary test
---
common/src/path.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/src/path.rs b/common/src/path.rs
index edce17249e..85e8f174af 100644
--- a/common/src/path.rs
+++ b/common/src/path.rs
@@ -231,7 +231,7 @@ where
.get(pos + Vec3::unit_z() * 3)
.map(|b| !b.is_solid())
.unwrap_or(true))
- && (dir.z > 0
+ && (dir.z >= 0
|| vol
.get(pos + *dir + Vec3::unit_z() * 2)
.map(|b| !b.is_solid())
From b940cde5018b0c424a54df677b4059ce76b1f04d Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Fri, 20 Mar 2020 09:47:00 +0100
Subject: [PATCH 07/10] change(panic): mention the game version in panic
---
voxygen/src/main.rs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index f2a091daf0..d461267ecf 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -123,7 +123,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\
@@ -131,13 +131,15 @@ fn main() {
The information below is intended for developers and testers.\n\
\n\
Panic Payload: {:?}\n\
- PanicInfo: {}",
- // TODO: Verify that this works
+ PanicInfo: {}\n\
+ Game version: {} [{}]",
Settings::get_settings_path()
.join("voxygen-<date>.log")
.display(),
reason,
panic_info,
+ common::util::GIT_HASH.to_string(),
+ common::util::GIT_DATE.to_string()
);
error!(
From d8cbd15204e5b1f4c62447bbb8355603aa0f48e6 Mon Sep 17 00:00:00 2001
From: Marcel <marcel.cochem@googlemail.com>
Date: Sun, 22 Mar 2020 12:44:32 +0000
Subject: [PATCH 08/10] Fix docker image for server-cli
---
server-cli/Dockerfile | 4 +++-
server-cli/docker-run.sh | 3 ---
2 files changed, 3 insertions(+), 4 deletions(-)
delete mode 100755 server-cli/docker-run.sh
diff --git a/server-cli/Dockerfile b/server-cli/Dockerfile
index eacecc7846..1dcdbcac34 100644
--- a/server-cli/Dockerfile
+++ b/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 ["RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli"]
diff --git a/server-cli/docker-run.sh b/server-cli/docker-run.sh
deleted file mode 100755
index e965090fdb..0000000000
--- a/server-cli/docker-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt
-RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli
From 48b59775511fcada379910875563ec8f5df29a93 Mon Sep 17 00:00:00 2001
From: Marcel <marcel.cochem@googlemail.com>
Date: Sun, 22 Mar 2020 14:56:14 +0000
Subject: [PATCH 09/10] add watchtower support and fix CMD in Dockerfile
---
server-cli/Dockerfile | 2 +-
server-cli/docker-compose.yml | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server-cli/Dockerfile b/server-cli/Dockerfile
index 1dcdbcac34..ee9c4009a5 100644
--- a/server-cli/Dockerfile
+++ b/server-cli/Dockerfile
@@ -7,4 +7,4 @@ COPY ./assets/common /opt/assets/common
COPY ./assets/world /opt/assets/world
WORKDIR /opt
-CMD ["RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli"]
+CMD [ "sh", "-c", "RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli" ]
diff --git a/server-cli/docker-compose.yml b/server-cli/docker-compose.yml
index ba9badf7de..d4e52b364f 100644
--- a/server-cli/docker-compose.yml
+++ b/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
+
From 0358caa1735c7a3b4b644d5fa58b48b6fd22151f Mon Sep 17 00:00:00 2001
From: Capucho <jcapucho7@gmail.com>
Date: Sun, 22 Mar 2020 22:06:05 +0000
Subject: [PATCH 10/10] Fix the wrong logs directory being displayed on panic
---
voxygen/src/main.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index d461267ecf..43b6726ab6 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -133,7 +133,9 @@ fn main() {
Panic Payload: {:?}\n\
PanicInfo: {}\n\
Game version: {} [{}]",
- Settings::get_settings_path()
+ Settings::load()
+ .log
+ .logs_path
.join("voxygen-<date>.log")
.display(),
reason,