Merge branch 'master' into develop

This commit is contained in:
Michał Janiszewski 2016-12-27 23:59:47 +01:00
commit 617413c8ae
5 changed files with 10 additions and 14 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
openrct2 (0.0.5-develop-1) unstable; urgency=medium
openrct2 (0.0.5-master-1) unstable; urgency=medium
* Fourth stable release. (Closes: #XXXXXX)

View File

@ -1,4 +1,4 @@
0.0.5 (in development)
0.0.5 (2016-12-27)
------------------------------------------------------------------------
This is the first fully implemented version of OpenRCT2. RCT2.EXE is no longer required.

View File

@ -1,8 +1,7 @@
Release version: 0.0.4
Release version: 0.0.5
------------------------------------------------------------------------
* Scenario editor object selection window will show object names in the selected language at the time of building the object cache. (Deleting plugin.dat in Documents/OpenRCT2 will fix this)
* Guest AI is slightly worse than the original game.
* Multiplayer is very experimental and is likely to desynchronise often.
* Picking up / hiring of staff and guests in multiplayer may cause the game to crash.
Some bugs or limitations present in the original game have not yet been fixed or lifted.

View File

@ -1,5 +1,5 @@
Last updated: 2016-04-13
Release version: 0.0.5.0-beta
Last updated: 2016-12-27
Release version: 0.0.5.0
------------------------------------------------------------------------
@ -69,8 +69,8 @@ following information in your bug report:
3.0) Supported platforms
---- -------------------
OpenRCT2 is currently supported on Windows Vista and above, many distributions of
Linux, macOS, and OS X 10.7 or higher. OpenRCT2 will only work on x86 architectures
as the original RollerCoaster Tycoon 2 binary is still required to run the game.
Linux, macOS, and OS X 10.7 or higher. OpenRCT2 will only work on
little-endian architectures.
Further instructions can be found on GitHub.
4.0) Installing and running OpenRCT2
@ -153,8 +153,9 @@ to all files in this distribution, except as noted below.
Jansson | MIT licence.
libcURL | MIT (or Modified BSD-style) licence.
libspeex | BSD-style license.
libspeex | BSD-style licence.
libpng | libpng licence.
libzip | BSD 3 clause licence.
SDL2 | zlib licence.
SDL2 TTF | zlib licence.
zlib | zlib licence.

View File

@ -30,11 +30,7 @@
const char *gBuildServer = "";
#endif
#ifdef OPENRCT2_BRANCH
const char *gGitBranch = OPENRCT2_BRANCH;
#else
const char *gGitBranch = "";
#endif
const char *gGitBranch = "";
#ifdef OPENRCT2_COMMIT_SHA1
const char *gCommitSha1 = OPENRCT2_COMMIT_SHA1;