(svn r4123) - Forward-port the release-changes from the 0.4 branch back to trunk. This ensures an updated changelog, known-bugs, etc.

8 files changed, 86 insertions, 29 deletions

diff --git a/changelog.txt b/changelog.txt
index 0294af67a..218b3e6f6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,46 @@
+0.4.7 (2006-03-26)
+------------------------------------------------------------------------
+
+- Feature: [OSX] Add support for triple-binaries (PPC, PPC970, i386) (r4102)
+- Fix: [OSX] crash when going to fullscreen (r4100)
+- Fix: Allow unused wagons to have their first cache set. Fixes faulty cache-warning message and noticably speeds up depot operations (r4094)
+- Fix: [NPF] Trains & busses were unable to find a route when leaving a depot or bus stop. (r4072)
+
+0.4.6 (2006-03-22)
+------------------------------------------------------------------------
+
+- Codechange: [win32] Show the revision in crash.txt and enable the button to show the crash text in the crash-window (r3965)
+- Codechange: Add additional linker information to release builds to help figure out crashes more easily (r3526)
+- Fix: [OSX 10.3 and newer] [ 1157244 ] Can't save game if name contains german umlauts (loading savegames with certain chars still look odd) (r4038)
+- Fix: [OSX] major speedup for PPC fullscreen (r4034)
+- Fix: [Makefile] Make sure the ICON_DIR gets created before copying files there. (r4032)
+- Fix: [win32] Change compiler settings to use the multithreaded CRT. This prevents certain crashes on multi-threaded machines. (r4031)
+- Fix: [ 1453646 NPF ] Road vehicles planning through the back of depots and stations. (r4029)
+- Fix: Use the title of a savegame in the saveload dialog-editbox. (r4018)
+- Fix: Improper resolution written to the configuration file when exiting from fullscreen. (r4017)
+- Fix: When removing rail track from a tile where only X and Y pieces exist, explicitly update signals in both directions. (r4016)
+- Fix: Default the patch-setting 'pause_on_join' to true. (r4015)
+- Fix: Slope and height information returned for some tile types is wrong (r4014)
+- Fix: Fixes a bug introduced by r3228 which allowed steep rail tiles resulting in ... unwanted effects such as display artifacts. (r4012)
+- Fix: Update french translation (r3978)
+- Fix: FS#56 - [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font. (r3970)
+- Fix: [ 1439907 ] Increase client list window width so at least most languages fit. (r3969)
+- Fix: Update german and finnish languages. (r3968)
+- Fix: Properly set back the owner of a crossing/road-under bridge after removing it. (r3967)
+- Fix: [autoreplace]: (FS#67) autoreplacing trains now keep their tile length instead of their pixel length. (r3964)
+- Fix: Mark the right tile as dirty. It's just a graphical glitch which happend in r1592. (r3962)
+- Fix: Fix crash when resizing news history window. (r3961)
+- Fix: Correctly implement minimum search, so road vehicles head twoards the closest station, not the last one in the list. (r3960)
+- Fix: [FS#61] The tooltips for raising and lowering land buttons in the scenario editor are interchanged (r3959)
+- Fix: Correctly restore the roadside after roadworks are finished. (r3957)
+- Fix: [Multistop] Check the status of the destination road stop instead of a station's first road stop. This only has effect with road vehicle queuing disabled. (r3956)
+- Fix: validate the setting of max_companies/spectators through the console. (r3955)
+- Fix: Improve game-load times. (r3954)
+- Fix: On loading a game, GetPlayerRailtypes() didn't account for the fact that vehicles are introduced a year after their introduction date. This will also relieve possible (rare) network desyncs. (r3952)
+- Fix: Restore plural forms of cargo types for several languages. (r3951)
+- Fix: [win32] Add directives to allow Visual Studio 2005 compilation. (r3950)
+- Fix: [ 1415782 ] crash in string code with openbsd/zaurus; alignment issues (r3948)
+
 0.4.5 (2006-01-31)
 ------------------------------------------------------------------------
 
diff --git a/docs/openttd.6 b/docs/openttd.6
index 3bb44a5bc..e59531620 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,9 +1,9 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd July 27, 2005
+.Dd March 26, 2006
 .Dt OPENTTD 6
 .Sh NAME
-.Nm openttd 
+.Nm openttd
 .Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
diff --git a/known-bugs.txt b/known-bugs.txt
index b084ab068..746949a32 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -15,22 +15,42 @@ or http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version.
 
-Bugs for 0.4.5
+Bugs for 0.4.7
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
--20	Saving files when run from gdb
--45	NORETURN wrongly declared for gcc
--46	Some if, for, switch and while have no space before (
--47	rating calculation and cargo loading priority
--9	[MorphOS] write to NULL when going to device root in filerequester
--8	[MorphOS] game crashes if no TCP/IP stack is loaded
+-80	Medium Crash when switching from windowed to fullscreen
+-78	Low Save vs. Autosave
+-77	Low cocoa video driver got an artifact in fullscreen
+-74	Low message settings
+-73	vehicle selection bug
+-71	Invalid last_vehicle for station (crash)
+-68	wagon replacements
+-66	wagon re-fitting
+-65	short wagons bug
+-63	Initial Volume Level not restored
+-57	(Ship) Pathfinder problem
+-55	Assertion on TrainController (train_cmd.c:2840)
+-52	desync when server saves game (on slow hardware)
+-51	Windows doesn't support CUSTOM_LANG_DIR
+-50	Trains chosing an alternative path when encountering a 1-way presignal instead of waiting
+-47	Low rating calculation and cargo loading priority
+-45	Low NORETURN wrongly declared for gcc
+-20	Low Saving files when run from gdb 2005-12-06 Unconfirmed
+- 9	Low [MorphOS] write to NULL when going to device root in filerequester 2005-11-28 Assigned Christian Rosentreter
 
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 
+-1458368	Ships cannot be sent to depot when loading with NPF on, transfer not working
+-1454591	Street junctions not able to converted
+-1453676	crash in windowed mode when moving mouse back to openttd
+-1436419	Vehicles profits gone negitive.......bug
+-1434000	Error in Transfer-Function
+-1433315	non-existant crash reporting
+-1432871	Wrong signalstate when track over track
+-1427531	Newspapers problem
 -1417453	Makefile and Variables issue
--1415782	crash in string code with openbsd/zaurus
 -1397638	Economics bug?
 -1395628	Trackpad panning/scrolling broken
 -1394799	Dual headed engines disagreement
@@ -40,11 +60,8 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -1389999	Child windows not sticking
 -1389986	Shares problem (nightly 3330)
 -1380497	problems with competitors during multiplayer
--1372772	Train gets lost between two stations
--1366446	different names for patches
 -1362784	Incorrect vehicule profit calcul with inflation on
 -1299162	Music volume too low
--1288024	Strange string on OTTD initial screen
 -1250094	Towns Shrink when center tile is built on
 -1244842	Multiplayer interface bug (0.4.0.1)
 -1212267	station visited twice when servicing
@@ -56,18 +73,17 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -1174829	Waypoint / Orders Bug
 -1168820	Some mouse and keyboard events are lost
 -1167810	Cargo payment after deleting stations (st->xy = 0)
--1157244	Can't save game if name contains german umlauts
 -1116638	"More, but smaller changes" deficiency
 -1106356	re-offered prototypes
 -1085486	Subsidies: Only count when station is in right suburb
 
-Minor Bugs for 0.4.5
+Minor Bugs for 0.4.7
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 
+-1424115	Reversed arrow sign in list view column headers
 -1412033	autoreplace not possible on monorail/maglev trains
 -1412031	fast forward scrolling is also fast forward :)
--1395489	Nightly 3358 Linux Driver warnings
 -1394316	Multistop traffic jam
 -1394231	Autorenew glitch on helicopters
 -1387424	overtake insolvent company is to cheap
@@ -75,7 +91,6 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -1372891	Performance loss with NTP & NPF
 -1342383	Last built rail type not cleared when starting new game
 -1296259	Autosave override for multiplayer games
--1254226	giant screenshot crashes multiplayer
 -1242753	Town population minus 10
 -1236320	Bug in main menu allows moving screen
 -1201284	permanent hilight in a depot
@@ -85,7 +100,6 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -1183253	Incorrect Load vs Loading Sprites
 -1183251	Hangar sprite does not update when refit.
 -1160732	little bug with transparency
--1153937	Game wont run from a start menu shortcut
 -1117731	Editor-StartingDate
 -1114237	Wrong autoreplace hint
 -1108046	game freezes
@@ -102,4 +116,4 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -0987883	Aircraft landing/taking off
 -0987880	company league table updating
 -0985924	aircraft taxi speed
--0941694	Clipping problems stations/vehicles on slopes
+-0941694	Clipping problems stations/vehicles on slopes
\ No newline at end of file
diff --git a/os/debian/changelog b/os/debian/changelog
index 6b5c3325a..6fa31bb85 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,4 +1,4 @@
-openttd (0.4.5+custom) unstable; urgency=low
+openttd (0.4.7-1) unstable; urgency=low
 
   * Remove old terminal messages and make sure that debconf is always called.
 
diff --git a/os/linux/openttd.spec b/os/linux/openttd.spec
index a53011f65..e3875b049 100644
--- a/os/linux/openttd.spec
+++ b/os/linux/openttd.spec
@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 
 %define name openttd
-%define version 0.3.6
+%define version 0.4.7
 %define release 1mdk
 
 #------------------------------------------------------------------------------
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 7bbfb6a16..126103288 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,8 +1,8 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.4.5.0"
-!define APPVERSION "0.4.5.0"
-!define INSTALLERVERSION 17 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAMEANDVERSION "OpenTTD 0.4.7.0"
+!define APPVERSION "0.4.7.0"
+!define INSTALLERVERSION 19 ;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/ottdres.rc b/ottdres.rc
index fbc5e93eb..ec361283f 100644
--- a/ottdres.rc
+++ b/ottdres.rc
@@ -65,8 +65,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,5,0
- PRODUCTVERSION 0,4,5,0
+ FILEVERSION 0,4,7,0
+ PRODUCTVERSION 0,4,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -84,7 +84,7 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "0.4.5.0\0"
+            VALUE "FileVersion", "0.4.7.0\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2006. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
diff --git a/readme.txt b/readme.txt
index 737326afe..cad636126 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2006-01-31
-Release version: 0.4.5
+Last updated:    2006-03-26
+Release version: 0.4.7
 ------------------------------------------------------------------------