(svn r24978) -Update: some assorted documentation tidbits

6 files changed, 66 insertions, 10 deletions

diff --git a/changelog.txt b/changelog.txt
index fb0736432..a5c6c22da 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,53 @@
+1.3.0-beta2 (2013-02-07)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Station randomisation triggers (r24906, r24905)
+- Feature: Settings type filter included in the advanced settings GUI (r24862, r24863)
+- Change: Revert to opening the vehicle GUI again when cloning vehicles using the clone-button from the depot GUI [FS#4458] (r24955)
+- Fix: Additional zoom in levels could glitch by a few pixels due to incorrect rounding [FS#5463] (r24975)
+- Fix: Honour pause_on_newgame setting when running as a dedicated server [FS#5279] (r24974)
+- Fix: [NewGRF] Prevent access to tile-based variables when tile is invalid [FS#5462] (r24973)
+- Fix: Do not make overbuilding rivers with canals insanely expensive [FS#5258] (r24972)
+- Fix: Crash when an infinite loop occurred during loading of a script [FS#5346] (r24970)
+- Fix: company window was not updated when shares were enabled/disabled [FS#5379] (r24968)
+- Fix: Trams would get stuck on water [FS#5228] (r24966)
+- Fix: With YAPF the docking behaviour differed per direction; now favour docking in the direction you approached [FS#5416] (r24964)
+- Fix: Do not stop loading if there are reservations left [FS#5435] (r24963)
+- Fix: Reserve all capacity while unloading to avoid 'stealing' cargo, i.e. loading cargo onto a second vehicle when the first cannot be fully filled yet [FS#5438] (r24962)
+- Fix: If a platform is enlarged and there is a reservation, reserve the whole platform [FS#5362] (r24961)
+- Fix: Inconsistencies in the 'thanks to' lists [FS#5423] (r24960)
+- Fix: Set 'replace when old' flag when replacing an autoreplace (r24950)
+- Fix: Deleting implicit orders was not able to deal with the various side-effects of DeleteOrder [FS#5452] (r24944)
+- Fix: Redraw autoreplace window properly in network games (r24939)
+- Fix: Never put a space between cargo name and subtype [FS#5447] (r24938)
+- Fix: Do not allow order refit to be set for no-load orders [FS#5446] (r24936)
+- Fix: Make group names unique per company and vehicle type [FS#3473] (r24933)
+- Fix: Prevent more NewGRFs being selected than is possible to load  [FS#5158] (r24932)
+- Fix: [GS] Do not try to pause or unpause crashed scripts [FS#5415] (r24929)
+- Fix: [Squirrel] Update line information before processing 'while' token of 'do'-'while' statement [FS#5408] (r24928)
+- Fix: Add a tooltip to the mapsize selection mentioning possible deviations [FS#5395] (r24925)
+- Fix: When an object built on a river is removed, restore the river [FS#5441] (r24923)
+- Fix: Upgrading bridges could steal road types [FS#5389] (r24912)
+- Fix: [GS] Allow GSs to pass negative integer string parameters (r24908)
+- Fix: 'Train loads/unloads cargo' station animation triggers on individual platform (r24904)
+- Fix: Cached station animation triggers were only set when removing parts of a station (r24903)
+- Fix: The station build window did not update when the station spread changed [FS#5434] (r24899)
+- Fix: Do not unpause the game when closing the highscore window if it was already paused before the highscore screen was shown (r24898)
+- Fix: Improvements and fixes for the base translation [FS#5411, FS#5420, FS#5421, FS#5422, FS#5427] (r24896, r24875, r24872, r24869)
+- Fix: Allow downgrade of road bridges in the scenario editor [FS#5436] (r24895)
+- Fix: Invalidate station selection window when station spread changes [FS#5434] (r24894)
+- Fix: Distribute GS compat_<version>.nut with OpenTTD (r24890)
+- Fix: Pass proper UTF-16 strings instead of UCS-2 to ICU in order to preserve characters outside the BMP (r24885)
+- Fix: A completely emptied vehicle could trigger an assert (r24883)
+- Fix: Desync when NewGRF changes the stats related to acceleration (power, weight, tractive effort, etc) during service or 32 day triggers (r24882)
+- Fix: Incorrect Romanian own name (r24874)
+- Fix: Make invalid sprite references to mapgen sprites behave the same as invalid references between recolour and real sprites [FS#5404] (r24858)
+- Fix: Do not let UFOs and coal mines clear water (r24857)
+- Fix: Do not let UFOs and coal mines destroy depots [FS#5406] (r24856)
+- Fix: Do not send aircraft to depots that are out of range of the next destination [FS#5405] (r24855)
+- Fix: Only consider vehicles available in the climate for purchase/depot cell size (r24854)
+- Fix: Extend widget data member to 32 bits so that sprite IDs >= 2^16 can be used (r24853)
+
+
 1.3.0-beta1 (2012-12-24)
 ------------------------------------------------------------------------
 - Feature: Advanced settings to disable certain sound effects (r24846)
@@ -85,8 +135,8 @@
 - Change: [NewGRF] Make bounding boxes of road vehicles change according to the vehicle length to make alignment easier [FS#5204] (r24331)
 - Fix: [NewGRF] Consider regearing-like cargos as no-cargo in cargo filters [FS#5386] (r24848)
 - Fix: [NewGRF] Draw NewGRF railtypes in NewGRF station previews (r24840)
-- Fix: Don't consider blocked rail station tiles that display wires as non-reachable for masking out unnecessary catenary wires (r24837)
-- Fix: The autorefit dropdown in the order GUI wasn't always updated when modifying vehicle consists [FS#5396] (r24834)
+- Fix: Do not consider blocked rail station tiles that display wires as non-reachable for masking out unnecessary catenary wires (r24837)
+- Fix: The autorefit dropdown in the order GUI was not always updated when modifying vehicle consists [FS#5396] (r24834)
 - Fix: [NewGRF] Incorrect values are better than a crash when a NewGRF queries vehicle variable 4C before vehicle initialisation is completed [FS#5398] (r24831)
 - Fix: determineversion.vbs could hang in a git checkout (r24826)
 - Fix: Close pending preview windows when the engine is introduced to everyone (r24812)
@@ -326,7 +376,7 @@
 - Fix: [SDL] Handle the SDL_VIDEOEXPOSE event to solve issues with SDL 1.3 (r23910)
 - Fix: [SDL] Fix keyboard-related segfault when compiling against SDL 1.3 (r23909)
 - Fix: [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean (r23908)
-- Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles (r23907)
+- Fix: [Makefile] Let 'make clean --dry-run' not delete Makefiles (r23907)
 - Fix: [Windows installer] OpenMSX got downloaded to and extracted in the wrong (non-existent) folder [FS#5045] (r23905)
 - Fix: Memory leak everytime one clicked a savegame in the load GUI (r23901)
 - Fix: [NewGRF] It was not possible to import sounds from a NewGRF later in the load order (r23883)
diff --git a/os/debian/changelog b/os/debian/changelog
index 4fe91571b..275e2c922 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.3.0-beta2) unstable; urgency=low
+
+  * New upstream release 1.3.0-beta2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 07 Feb 2013 00:00:00 +0100
+
 openttd (1.3.0-beta1) unstable; urgency=low
 
   * New upstream release 1.3.0-beta1
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 86ee60f57..27d72c572 100644
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.3.0-beta1
+set OPENTTD_VERSION=1.3.0-beta2
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec
index 7eaf553a7..91ffc8dfd 100644
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
 #
 
 Name:           openttd
-Version:        1.3.beta1
+Version:        1.3.beta2
 Release:        0
-%define srcver  1.3.0-beta1
+%define srcver  1.3.0-beta2
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index 28fa0852d..e94c57a82 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 3
 !define APPV_MAINT 0
-!define APPV_BUILD 0
-!define APPV_EXTRA "-beta1"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-beta2"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
diff --git a/readme.txt b/readme.txt
index 092c43176..4664cbc4a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-12-24
-Release version: 1.3.0-beta1
+Last updated:    2013-02-07
+Release version: 1.3.0-beta2
 ------------------------------------------------------------------------