(svn r22751) -Merge: documentation updates from 1.1

5 files changed, 95 insertions, 6 deletions

diff --git a/changelog.txt b/changelog.txt
index f1680b9aa..8afab9828 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,65 @@
+1.1.2 (2011-08-14)
+------------------------------------------------------------------------
+- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [FS#4717] (r22737, r22736)
+- Fix: [NewGRF] Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735)
+
+
+1.1.2-RC2 (2011-07-30)
+------------------------------------------------------------------------
+- Fix: Cost of adding an extra road type to a bridge or tunnel was undercalculated [FS#4680, FS#4681] (r22700, r22699)
+- Fix: Only insert cleared object tiles into _cleared_object_areas if clearing actually succeeds, else subsequential tests of the same tile will be skipped and considered successful [FS#4694] (r22698)
+- Fix: When building a house it could be built at the wrong place if multitile houses failed some tests (r22697)
+- Fix: [Network] Failed network address resolving could trigger temporary freezes [FS#4697] (r22696, r22695)
+- Fix: [NewGRF] The override managers were not reset in some cases like creating a new scenario [FS#4691] (r22693)
+- Fix: [NewGRF] Aircrafts defined with IDs above the default aircrafts always defaulted to passenger cargo (r22690)
+
+
+1.1.2-RC1 (2011-07-24)
+------------------------------------------------------------------------
+- Change: [NewGRF] Only allow access (via hotkey and menu) to the bounding box visualisation when NewGRF developer tools are enabled (r22675)
+- Fix: [NewGRF] Disallow accessing variable 1B in network games due to desync reasons (r22682)
+- Fix: Switching from a red to a white highlight (by switching to another tool) without switching the highlight mode (HT_RECT etc.) did not mark the selection dirty [FS#4670] (r22649)
+- Fix: [NewGRF] Parameters from NewGRFs were not properly parsed in all cases [FS#4599] (r22648, r22630, r22629, r22628, r22627)
+- Fix: GetSection() does not return a LockPart [FS#4678] (r22645)
+- Fix: [NewGRF] Disallow building NewObjects on water tiles owned by another company (r22643)
+- Fix: [NewGRF] Disable the 'set parameters' button in the NewGRF GUI, if the GRF specifies to have no parameters and one would not be able to set any parameters anyway (r22642)
+- Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water (r22638)
+- Fix: [NewGRF] Airports should not expose the tile specific random bits of the north tile. Only airport tiles should access those (r22636)
+- Fix: [NewGRF] Correctly reseed random bits of industries and industry tiles (r22635, r22634)
+- Fix: [NewGRF] Implement variables 25 and 7F for railtypes (r22633)
+- Fix: [NewGRF] Additional text in fund industry window is NewGRF supplied and thus should have a default colour (r22631)
+- Fix: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings [FS#4622] (r22626)
+- Fix: Do not zero the orders of disaster vehicles when converting savegames [FS#4642] (r22625)
+- Fix: When closing an AI company the local player cheated to, we need to cheat him to another company [FS#4654] (r22624, r22623)
+- Fix: When closing down companies their shares in other companies must be sold even if share trading is disabled at that point of time (r22622)
+- Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is choosed. This also prevents crashing when clicking unpause while the confirm window is shown (r22621)
+- Fix: Enforce refit orders to be 'always go to depot' orders; service-only and stop-in-depot orders make no sense with refitting [FS#4651] (r22620)
+- Fix: Consider the size of the vehicle sprite for the lineheight in the company GUI. This also makes the widget containing the sprite not skip drawing it, if the bounds of the widget are outside of the drawing area though the sprite actually needs drawing [FS#4662] (r22619)
+- Fix: When changing difficulty settings over the network, do not just reopen the difficulty window if any game options window is opened; instead invalidate them properly [FS#4653] (r22618, r22617)
+- Fix: [NewGRF] If callback 33 returns a value out of range, no sound effect shall be played [FS#4656] (r22614)
+- Fix: Use rotated heightmap sizes for reporting scaling problems [FS#4663] (r22608)
+- Fix: Do not show cargo accepted/produced in the new station window when no tiles are selected (mouse hovering a window or toolbar) [FS#4647] (r22595, r22593)
+- Fix: Add active NewGRFs to the list of available ones when selecting the empty preset [FS#4644] (r22594)
+- Fix: Reading of heightmaps with uncommon BMP formats failed due to uninitialised variables [FS#4645] (r22592)
+- Fix: PBS order forecasting modified the current order index in case of a goto-nearest-depot order and no depot could be found [FS#4641] (r22589)
+- Fix: Remove BaseStorageArrays from _changed_storage_arrays on destruction (r22583, r22551)
+- Fix: Do not increment STL iterators after they have been invalidated (r22582)
+- Fix: Do not lower the arrow buttons in the NewGRF/AI parameter windows if they are clicked when disabled (r22553, r22499)
+- Fix: Clear airport persistent storage on construction/removal of airports (r22552)
+- Fix: Possible crash when opening the airport build window for the first time [FS#4619] (r22538)
+- Fix: Replace the half small airport structure on the intercontinental airport with some grass [FS#3494] (r22537)
+- Fix: Documentation omission regarding admin protocol [FS#4632] (r22536)
+- Fix: [NoAI] Doing rescan_ai in a game with running AIs caused a crash [FS#4631] (r22534)
+- Fix: Do not create an implicit order if the current order is the first order in the order list and we visit the station of the last entry of the order list (r22532)
+- Fix: MinGW 64 related compilation issues [FS#4623] (r22522, r22491, r22490, r22489)
+- Fix: The layout selectors of the airport build GUI did not latch properly (r22497, r22495)
+- Fix: Callback result for airport layout name was incorrectly used (r22496)
+- Fix: Airport preview sprite can depend on the layout, so update the cached SpriteID when the layout changes (r22494)
+- Fix: Engine IDs for coal and mail wagons were swapped in the TTO savegame conversion [FS#4622] (r22487)
+- Fix: The caption of centered windows could be moved out of the main window and thus become inaccessible when resizing the main window (r22485, r22484)
+- Fix: No client error packet was sent to the admin bots [FS#4585] (r22384)
+
+
 1.1.1 (2011-06-01)
 ------------------------------------------------------------------------
 - Change: Automatic orders are better called implicit orders as no real order influencing path finding is added (r22474, r22473)
@@ -27,7 +89,6 @@
 - Fix: When a game uses a lot of NewGRFs the buffer for storing that information in the PNG is too small (r22388)
 - Fix: Windows' recv seems to return 'graceful closed' before having passed the remaining buffer which causes OpenTTD to think all connections are 'incorrectly' terminated, i.e. without the 'I am leaving' packet from the client. So let the client wait a tiny bit after sending the 'I am leaving' packet and before gracefully closing the connection [FS#4601] (r22387)
 - Fix: When the last AI company gets removed, the 'dead' state was not reset in the AI debug window [FS#4602] (r22386)
-- Fix: No client error packet was sent to the admin bots [FS#4585] (r22384)
 - Fix: Recolouring of silicon bridge was done incorrectly (r22380, r22379, r22378)
 - Fix: Crash when clicking a removed company in the vehicle list dropdowns [FS#4592] (r22373)
 - Fix: Keep better accounting of the order in which clients joined; client cannot be starved from joining and they get shown the amount of clients waiting in front of them (r22372, r22370, r22369, r22368, r22367, r22366, r22365, r22364, r22363, r22362, r22361)
diff --git a/known-bugs.txt b/known-bugs.txt
index 3c387d533..4dfe2adff 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-06-01
-Release version: 1.1.1
+Last updated:    2011-08-14
+Release version: 1.1.2
 ------------------------------------------------------------------------
 
 
@@ -39,6 +39,8 @@ officially supporting Mac OS X again. For now it remains unsupported and
 we only apply bug fixes provided by the community but we are unable to fix
 these bugs ourselves.
 
+- 4695  [OSX] Crash when switching to full screen with OS X Lion
+- 4689  [OSX] Crash when hiding window after coming from full screen
 - 4594  [Windows] Minimizing the windows when a modal error message is
         shown makes it difficult to exit the game
 - 4420  [OSX] OS' mouse pointer still shows
diff --git a/os/debian/changelog b/os/debian/changelog
index 4394dea74..f18054061 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -2,7 +2,25 @@ openttd (1.2.0~alpha) unstable; urgency=low
 
   * Alpha releases of trunk leading to 1.2.0-beta1
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Apr 2011 00:00:01 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 15 Aug 2011 00:00:01 +0100
+
+openttd (1.1.2) unstable; urgency=low
+
+  * New upstream release 1.1.2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Aug 2011 17:00:00 +0200
+
+openttd (1.1.2~RC2) unstable; urgency=low
+
+  * New upstream release 1.1.2-RC2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 30 Jul 2011 21:00:00 +0200
+
+openttd (1.1.2~RC1) unstable; urgency=low
+
+  * New upstream release 1.1.2-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 24 Jul 2011 21:00:00 +0200
 
 openttd (1.1.1) unstable; urgency=low
 
diff --git a/readme.txt b/readme.txt
index 1bce27693..1326b9d25 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-06-01
-Release version: 1.1.1
+Last updated:    2011-08-14
+Release version: 1.1.2
 ------------------------------------------------------------------------
 
 
diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp
index 76897a837..2fc2b13bf 100644
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -30,6 +30,14 @@
  * API removals:
  * \li AICompany::GetCompanyValue, use AICompany::GetQuarterlyCompanyValue instead.
  *
+ * \b 1.1.2
+ *
+ * No changes
+ *
+ * \b 1.1.1
+ *
+ * No changes
+ *
  * \b 1.1.0
  *
  * API additions: