(svn r8254) -Merge: Release changes from the 0.5 branch back to trunk. This ensures an updated changelog, readme, et.

6 files changed, 35 insertions, 21 deletions

diff --git a/changelog.txt b/changelog.txt
index 3ef82e8d0..f5e41e953 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,23 @@
+0.5.0-RC4 (2007-01-18)
+------------------------------------------------------------------------
+- Feature: Increase spritecache size to 2MB, will increase performance in games using newgrf files (r8218)
+- Feature: OS/2 support with GCC (Watcom is dropped) (r8042)
+- Codechange: Add Japanese, Slovenian language as an official translation and split Norwegian into Bokmal and Nynorsk (r7987, r8084, r8069)
+- Codechange: Show error messages about our own data files as a popup, or to stderr if console is available (and not to stdout) (r8013, r8134)
+- Codechange: Change the ordering of the network list, compatible servers just missing grf files are below fully compatible servers, not on the bottom (r8118)
+- Fix: Return proper error value when unthreaded save fails, prevents server sending 0-sized files (r8171)
+- Fix: Network client crashes when a server sends a 0-sized savegame [FS#556] (r8167)
+- Fix: Several desync fixes (incorrect roadstop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157)
+- Fix: Some disaster-events fixed: combat chopper shoots from right position, submarine once again moves around (r8140, r8158)
+- Fix: "out of sprite memory" warning messages due to incorrect assumption of requested memory for sprites (r8133)
+- Fix: Bouys are now built and numbered 1..9 not 9..1 [FS#538] (r8123)
+- Fix: Clicking for more news properly cycles through the news history backwards, and doesn't show the first item doubly if it's already open (r8049)
+- Fix: Crash when removing a town in the scenario editor while the query window is open for one of the town's tiles (r8030)
+- Fix: Overflow of system-ticks was not handled properly, resulting in a possibly unresponsive server/client (r8028)
+- Fix: Automatic pause interfering with 'pause_on_join setting' in MP when <shift> is pressed [FS#486] (r8027)
+- Fix: Picking up en-route cargo will also have virtual profit deducted for trains aswell (r8026)
+- Fix: Out-of-bounds read access on _clients array (harmless) (r7984)
+
 0.5.0-RC3 (2007-01-07)
 ------------------------------------------------------------------------
 - Codechange: Add Lithuanian language as an official translation (r7806)
diff --git a/docs/openttd.6 b/docs/openttd.6
index 257fa38b9..aae895157 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd January 07, 2007
+.Dd January 18, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
diff --git a/known-bugs.txt b/known-bugs.txt
index c4a9ddb9c..284ce1463 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -19,33 +19,31 @@ Bugs for 0.5.0
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
--523	Aircraft too cheap
+-559	Front-/Rear-facing engines don't line up with each other
+-553	Autorenew doesn't warn when replacement isn't available
+-546	[0.5.0 RC3] Inflation overflow
+-542	Assertion with Vehicle list
+-540	Planes vanished when offered exclusive
+-539	Trains can cash the same cargo multiple times
+-529	newairport's sprite issue
 -522	overflow on vehicle costs
--521	Mythical train
 -519	Bridge building results in 'missing' pieces
--518	Vehicle at final leg of transfer chain gets negative profit on load
--513	Client Crash - Server running saved game
 -508	Destroying trees and replanting => raised rating
--503	Load game failed: inflate() failed.
 -502	OSX can incorrectly print "dbg: [sl] Cannot open savegame 'data/opntitle.dat' for saving/loading."
 -501	Mouse pointer gets hidden, when draging out of window and back again. Only affects Wacom etc.
+-494	Get free money abusing a stock bug
 -489	[0.5.0rc1] Sound choppy on Vista
--483	!invalid string id 0 in GetString when trying to host a game after upgrade to 0.5.0-RC1 - workaround
 -474	Overtaking car doesn't hit the against-riding car.
--465	Crash in Linux (Debian)
--460	vehicles not avaible - unable to build
 -459	Merging is buggy
 -458	Crash when changing Resolution on Mac OS X (x86)
 -450	GUI selecting disabled numbers (newstations)
--444	Compile issues (networking) on Sun and SGI platforms
 -442	Alt-tab behaviour flawed whilst full screen (win32)
 -441	Transparent stuff
 -435	Assertion window doesn't show when in fullscreen on Mac OS X
--432	Assertion failed: AircraftController in aircraft_cmd.c (line 771)
+-431	failure to autorenew (core/GUI desync)
 -423	Improved loading causes high CPU use with long trains
 -410	Openttd in dedicated mode don't run without data files
 -404	Cargo never delivered to station after bribe and before first pickup
--379	Integer overflow with huge cities
 -365	Blimp Stuck at airport
 -362	Changing signal type affects whole square
 -357	CPU spikes in game
@@ -63,7 +61,6 @@ URL: http://bugs.openttd.org
 -193	Inconsistent directory usage on Mac OS X
 -165	vehicle length not taken into account
 -163	Cargo: Station destroyed / High payment
--158	Crash with !v->type == VEH_Ship error
 -153	Language crash with app renaming OSX
 -119	Clipping problems with vehicles on slopes
 -115	inactive logins do not get auto kicked
@@ -83,7 +80,6 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -1244842	Multiplayer interface bug (0.4.0.1)
 -1212267	station visited twice when servicing
 -1208170	Duplicate station names can be created
--1197116	Some stations are cargo-less
 -1116638	"More, but smaller changes" deficiency
 -1106356	re-offered prototypes
 
@@ -91,7 +87,6 @@ Minor Bugs for 0.5.0
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 
--1488896	enable higher resolutions
 -1461629	[r4180]Subsidy calculated wrong
 -1412031	fast forward scrolling is also fast forward :)
 -1387424	overtake insolvent company is to cheap
@@ -111,4 +106,3 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 - 987883	Aircraft landing/taking off
 - 987880	company league table updating
 - 985924	aircraft taxi speed
-- 941694	Clipping problems stations/vehicles on slopes
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 8c56d086c..0104b3281 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -2,7 +2,7 @@
 !define APPNAME "OpenTTD"
 !define APPNAMEANDVERSION "OpenTTD 0.5.0.0"
 !define APPVERSION "0.5.0.0"
-!define INSTALLERVERSION 25 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 26 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
diff --git a/readme.txt b/readme.txt
index 77a6474d3..1ac0f4cff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2007-01-07
-Release version: 0.5.0-RC3
+Last updated:    2007-01-18
+Release version: 0.5.0-RC4
 ------------------------------------------------------------------------
 
 
@@ -281,7 +281,7 @@ The OpenTTD team (in alphabetical order):
   Kerekes Miham (MiHaMiX)        - Maintainer of translator service, and host of nightlies
 
   Peter Nelson (peter1138)       - Spiritual descendant from newgrf gods
-  Remko Bijker (Rubidium)        - Programmer
+  Remko Bijker (Rubidium)        - THE desync hunter
   Christoph Mallon (Tron)        - Programmer, code correctness police
   Patric Stout (TrueLight)       - Programmer, network guru, SVN-repository and website host
 
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 5e61b1725..a0ff1b88c 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -213,7 +213,7 @@ static const char *credits[] = {
 	"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)",
 	"  Attila Bán (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
 	"  Peter Nelson (peter1138) - Spiritual descendant from newgrf gods",
-	"  Remko Bijker (Rubidium) - Belugas code scrutinizer",
+	"  Remko Bijker (Rubidium) - THE desync hunter",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
 	"  Patric Stout (TrueLight) - Coder, network guru, SVN- and website host",
 	"",