From ec03c4518a17e0e2e526b56f9969df8f6e70693d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Sat, 16 May 2020 00:50:40 +0200 Subject: [PATCH 1/3] Change the version number to 0.6 --- CHANGELOG.md | 13 +++++++++++-- Cargo.lock | 14 +++++++------- chat-cli/Cargo.toml | 2 +- client/Cargo.toml | 2 +- common/Cargo.toml | 2 +- server-cli/Cargo.toml | 2 +- server/Cargo.toml | 2 +- voxygen/Cargo.toml | 2 +- world/Cargo.toml | 2 +- 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99a2bedbe7..d0ab3b9468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed + +### Removed + +## [0.6.0] - 2020-05-16 + +### Added + - Added music system - Added zoomable and rotatable minimap - Added rotating orientation marker to main-map @@ -98,7 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed -## [0.5.0] - 2019-01-31 +## [0.5.0] - 2020-01-31 ### Added @@ -262,7 +270,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 _0.1.0 was part of the legacy engine_ -[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.5.0&to=master +[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.6.0&to=master +[0.0.6]: https://gitlab.com/veloren/veloren/compare?from=v0.5.0&to=v0.6.0 [0.0.5]: https://gitlab.com/veloren/veloren/compare?from=v0.4.0&to=v0.5.0 [0.0.4]: https://gitlab.com/veloren/veloren/compare?from=v0.3.0&to=v0.4.0 [0.0.3]: https://gitlab.com/veloren/veloren/compare?from=v0.2.0&to=v0.3.0 diff --git a/Cargo.lock b/Cargo.lock index 2f87657016..a5dbad11c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4959,7 +4959,7 @@ dependencies = [ [[package]] name = "veloren-chat-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "log 0.4.8", "pretty_env_logger", @@ -4969,7 +4969,7 @@ dependencies = [ [[package]] name = "veloren-client" -version = "0.5.0" +version = "0.6.0" dependencies = [ "authc", "byteorder 1.3.4", @@ -4985,7 +4985,7 @@ dependencies = [ [[package]] name = "veloren-common" -version = "0.5.0" +version = "0.6.0" dependencies = [ "authc", "bincode", @@ -5017,7 +5017,7 @@ dependencies = [ [[package]] name = "veloren-server" -version = "0.5.0" +version = "0.6.0" dependencies = [ "authc", "chrono", @@ -5048,7 +5048,7 @@ dependencies = [ [[package]] name = "veloren-server-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "log 0.4.8", "pretty_env_logger", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "veloren-voxygen" -version = "0.5.0" +version = "0.6.0" dependencies = [ "authc", "backtrace", @@ -5110,7 +5110,7 @@ dependencies = [ [[package]] name = "veloren-world" -version = "0.5.0" +version = "0.6.0" dependencies = [ "arr_macro", "bincode", diff --git a/chat-cli/Cargo.toml b/chat-cli/Cargo.toml index e09fb1f4d3..26496086dd 100644 --- a/chat-cli/Cargo.toml +++ b/chat-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-chat-cli" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto "] edition = "2018" diff --git a/client/Cargo.toml b/client/Cargo.toml index ad417fb0e3..00ac354e53 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-client" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto "] edition = "2018" diff --git a/common/Cargo.toml b/common/Cargo.toml index 69d7217c7a..d55ba5e696 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-common" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto ", "Maciej Ćwięka ", "Imbris "] edition = "2018" diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index 6473c9352e..a7e64705d5 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-server-cli" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto "] edition = "2018" diff --git a/server/Cargo.toml b/server/Cargo.toml index 165513ac2f..2530a6d5d3 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-server" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto "] edition = "2018" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 4db7486a20..cc4d84312f 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-voxygen" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto ", "Imbris "] edition = "2018" default-run = "veloren-voxygen" diff --git a/world/Cargo.toml b/world/Cargo.toml index 0ff1838510..b8bacc991d 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veloren-world" -version = "0.5.0" +version = "0.6.0" authors = ["Joshua Barretto "] edition = "2018" From 39de4bd4fd6708a56e6a53f6728a17648f672f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Sat, 16 May 2020 01:07:07 +0200 Subject: [PATCH 2/3] swap main background for 0.6 background --- assets/voxygen/background/bg_main.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png index 4aacac4cc1..a649a21218 100644 --- a/assets/voxygen/background/bg_main.png +++ b/assets/voxygen/background/bg_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f8220ddae73f94071e7309d751c894897775ac241dc2b8da2de64346f4ec083 -size 1972446 +oid sha256:c3f7cc1b6f4b93eaf101c83f1fb34a48a67957250905c829cf79487dae27bfff +size 2894214 From 4876dd492dd2efff94cde3a97f813595d1bac85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Sat, 16 May 2020 01:18:50 +0200 Subject: [PATCH 3/3] fix Changelog.md links --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0ab3b9468..3b473dd5f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -271,9 +271,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 _0.1.0 was part of the legacy engine_ [unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.6.0&to=master -[0.0.6]: https://gitlab.com/veloren/veloren/compare?from=v0.5.0&to=v0.6.0 -[0.0.5]: https://gitlab.com/veloren/veloren/compare?from=v0.4.0&to=v0.5.0 -[0.0.4]: https://gitlab.com/veloren/veloren/compare?from=v0.3.0&to=v0.4.0 -[0.0.3]: https://gitlab.com/veloren/veloren/compare?from=v0.2.0&to=v0.3.0 -[0.0.2]: https://gitlab.com/veloren/veloren/compare?from=7d17f8b67a2a6d5aa00730f028cedc430fd5075a&to=v0.2.0 -[0.0.1]: https://gitlab.com/veloren/game +[0.6.0]: https://gitlab.com/veloren/veloren/compare?from=v0.5.0&to=v0.6.0 +[0.5.0]: https://gitlab.com/veloren/veloren/compare?from=v0.4.0&to=v0.5.0 +[0.4.0]: https://gitlab.com/veloren/veloren/compare?from=v0.3.0&to=v0.4.0 +[0.3.0]: https://gitlab.com/veloren/veloren/compare?from=v0.2.0&to=v0.3.0 +[0.2.0]: https://gitlab.com/veloren/veloren/compare?from=7d17f8b67a2a6d5aa00730f028cedc430fd5075a&to=v0.2.0 +[0.1.0]: https://gitlab.com/veloren/game