diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7e34f5b036..4151e7208c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. --> **OS:** [e.g. Windows 10] -**Version:** [e.g. 0.1.2] +**Version:** [e.g. 0.2.0] **Commit/Build:** [e.g. 426e106] diff --git a/.travis.yml b/.travis.yml index 5f9bce4219..d04e8920e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ sudo: required dist: trusty env: global: - - OPENRCT2_VERSION="0.1.3" + - OPENRCT2_VERSION="0.2.0" matrix: include: diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index a9320f5570..f602571e57 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -3482,7 +3482,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "version=\"0.1.2\"\nzipname=\"title-sequence-v$version.zip\"\nliburl=\"https://github.com/OpenRCT2/title-sequences/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/title\" || ! -e \"${SRCROOT}/sequencesversion\" || $(head -n 1 \"${SRCROOT}/sequencesversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/title\" ]]; then rm -r \"${SRCROOT}/data/title\"; fi\nmkdir -p \"${SRCROOT}/data/title\"\n\ncurl -L -o \"${SRCROOT}/data/title/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/title\" \"${SRCROOT}/data/title/$zipname\"\nrm \"${SRCROOT}/data/title/$zipname\"\n\necho $version > \"${SRCROOT}/sequencesversion\"\nfi"; + shellScript = "version=\"0.2.0\"\nzipname=\"title-sequence-v$version.zip\"\nliburl=\"https://github.com/OpenRCT2/title-sequences/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/title\" || ! -e \"${SRCROOT}/sequencesversion\" || $(head -n 1 \"${SRCROOT}/sequencesversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/title\" ]]; then rm -r \"${SRCROOT}/data/title\"; fi\nmkdir -p \"${SRCROOT}/data/title\"\n\ncurl -L -o \"${SRCROOT}/data/title/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/title\" \"${SRCROOT}/data/title/$zipname\"\nrm \"${SRCROOT}/data/title/$zipname\"\n\necho $version > \"${SRCROOT}/sequencesversion\"\nfi"; }; D4EC012A1C25532B00DAFE69 /* Setup AppIcon */ = { isa = PBXShellScriptBuildPhase; diff --git a/appveyor.yml b/appveyor.yml index 70949febdc..a8a0cf2e11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.1.3.{build} +version: 0.2.0.{build} image: - Visual Studio 2017 cache: diff --git a/debian/changelog b/debian/changelog index 643d93c294..f5d047315a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openrct2 (0.1.3-develop-1) unstable; urgency=medium +openrct2 (0.2.0-develop-1) unstable; urgency=medium - * Release 2017-07 (Closes: #XXXXXX) + * Release 2018-06 (Closes: #XXXXXX) -- Michał Janiszewski Sun, 10 Jan 2016 23:41:16 +0100 diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e80fb6d7ff..b26edec305 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,4 +1,4 @@ -0.1.3 (in development) +0.2.0 (2018-06-10) ------------------------------------------------------------------------ - Feature: [#1417] Allow saving track designs for flat rides. - Feature: [#1675] Auto-rotate shops to face footpaths. diff --git a/distribution/macos/Info.plist b/distribution/macos/Info.plist index 6632b22a30..eff08ae713 100644 --- a/distribution/macos/Info.plist +++ b/distribution/macos/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.1.3 + 0.2.0 CFBundleSignature ORCT LSMinimumSystemVersion diff --git a/distribution/readme.txt b/distribution/readme.txt index 4c4994c28d..2c803d5b1a 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2018-03-18 -Release version: 0.1.2 +Last updated: 2018-06-10 +Release version: 0.2.0 ------------------------------------------------------------------------ @@ -143,12 +143,12 @@ to all files in this distribution, except as noted below. Jansson | MIT licence. libcURL | MIT (or Modified BSD-style) licence. +libicu | Unicode licence. libspeex | BSD-style licence. libpng | libpng licence. libzip | BSD 3 clause licence. OpenSSL | OpenSSL Licence SDL2 | zlib licence. -SDL2 TTF | zlib licence. zlib | zlib licence. Licences for sub-libraries used by the above may vary. For more information, visit the libraries' respective official websites. diff --git a/openrct2.proj b/openrct2.proj index 738e1f61d1..6352fdaaf4 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -18,7 +18,7 @@ x64 $(GIT_COMMIT_SHA1.Substring(0, 7)) - 0.1.3 + 0.2.0 -$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT) 16 diff --git a/readme.md b/readme.md index 740290f5fe..6b100ae7ac 100644 --- a/readme.md +++ b/readme.md @@ -10,8 +10,8 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m ### Build Status | | Windows | Linux / Mac | Download | |-------------|---------|-------------|----------| -| **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.1.2-green.svg)](https://openrct2.org/downloads/master/latest) | -| **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.1.3-blue.svg)](https://openrct2.org/downloads/develop/latest) | +| **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.2.0-green.svg)](https://openrct2.org/downloads/master/latest) | +| **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.0-blue.svg)](https://openrct2.org/downloads/develop/latest) | --- diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index cde16d50fe..42043598a1 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion 25 versionCode 2 - versionName '0.1.3' + versionName '0.2.0' externalNativeBuild { cmake { diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index 3569d34cb3..603e8cb278 100644 --- a/src/openrct2/Version.h +++ b/src/openrct2/Version.h @@ -19,7 +19,7 @@ #include "common.h" #define OPENRCT2_NAME "OpenRCT2" -#define OPENRCT2_VERSION "0.1.3" +#define OPENRCT2_VERSION "0.2.0" #if defined(__amd64__) || defined(_M_AMD64) #define OPENRCT2_ARCHITECTURE "x86-64" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 3d2cbe1e42..c48bae0c77 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -34,7 +34,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "19" +#define NETWORK_STREAM_VERSION "0" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;