Update: Prepare for 1.10.0-beta2 release

Update: Translations from eints
french: 1 change by arikover
2025-08-29 17:39:09 +00:00 · 2019-12-24 22:20:28 +00:00 · 2019-12-24 19:45:40 +01:00 · 2019-12-24 17:37:30 +00:00 · 2019-12-24 13:14:11 +00:00 · 2019-12-23 21:07:45 +01:00
1364 changed files with 2906 additions and 5635 deletions
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -0,0 +1,60 @@
 ### The OpenTTD team (in alphabetical order):
 - Grzegorz Duczyński (adf88) - General coding (since 1.7.2)
 - Albert Hofkamp (Alberth) - GUI expert (since 0.7)
 - Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)
 - Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)
 - Christoph Elsenhans (frosch) - General coding (since 0.6)
 - Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
 - Charles Pigott (LordAro) - General / Correctness police (since 1.9)
 - Michael Lutz (michi_cc) - Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
 - Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
 - Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
 - José Soler (Terkhen) - General coding (since 1.0)
 - Leif Linse (Zuu) - AI/Game Script (since 1.2)
 ### Inactive Developers:
 - Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
 - Bjarni Corfitzen (Bjarni) - macOS port, coder and vehicles (0.3 - 0.7)
 - Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
 - Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
 - Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
 - Attila Bán (MiHaMiX) - WebTranslator 1 and 2 (0.3 - 0.5)
 - Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
 - Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
 - Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
 - Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
 ### Retired Developers:
 - Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
 - Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
 - Emil Djupfeld (egladil) - macOS port (0.4 - 0.6)
 - Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
 - Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
 - Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
 - Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
 - Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
 - Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)
 ### Thanks to:
 - Josef Drexler - For his great work on TTDPatch.
 - Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and track foundations
 - Stefan Meißner (sign_de) - For his work on the console
 - Mike Ragsdale - OpenTTD installer
 - Christian Rosentreter (tokai) - MorphOS / AmigaOS port
 - Richard Kempton (RichK67) - Additional airports, initial TGP implementation
 - Alberto Demichelis - Squirrel scripting language
 - L. Peter Deutsch - MD5 implementation
 - Michael Blunck - For revolutionizing TTD with awesome graphics
 - George - Canal graphics
 - Andrew Parkhouse (andythenorth) - River graphics
 - David Dallaston (Pikka) - Tram tracks
 - All Translators - For their support to make OpenTTD a truly international game
 - Bug Reporters - Thanks for all bug reports
 - Chris Sawyer - For an amazing game!
--- a/2
+++ b/2
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/README.md
+++ b/README.md
@@ -3,215 +3,78 @@
 ## Table of contents
 - 1.0) [About](#10-about)
-    - 1.1) [Compiling OpenTTD](#11-compiling-openttd)
+    - 1.1) [Downloading OpenTTD](#11-downloading-openttd)
-    - 1.2) [Contributing to OpenTTD](#12-contributing-to-openttd)
+    - 1.2) [OpenTTD gameplay manual](#12-openttd-gameplay-manual)
- 2.0) [Contacting](#20-contacting)
+    - 1.3) [Supported platforms](#13-supported-platforms)
-    - 2.1) [Reporting bugs](#21-reporting-bugs)
+    - 1.4) [Installing and running OpenTTD](#14-installing-and-running-openttd)
-    - 2.2) [Reporting desyncs](#22-reporting-desyncs)
+    - 1.5) [Add-on content / mods](#15-add-on-content--mods)
- 3.0) [Supported platforms](#30-supported-platforms)
+    - 1.6) [OpenTTD directories](#16-openttd-directories)
- 4.0) [Installing and running OpenTTD](#40-installing-and-running-openttd)
+    - 1.7) [Compiling OpenTTD](#17-compiling-openttd)
-    - 4.1) [(Required) 3rd party files](#41-required-3rd-party-files)
+- 2.0) [Contact and community](#20-contact-and-community)
-    - 4.2) [OpenTTD directories](#42-openttd-directories)
+    - 2.1) [Contributing to OpenTTD](#21-contributing-to-openttd)
-    - 4.3) [Portable installations (portable media)](#43-portable-installations-portable-media)
+    - 2.2) [Reporting bugs](#22-reporting-bugs)
-    - 4.4) [Files in tar (archives)](#44-files-in-tar-archives)
+    - 2.3) [Translating](#23-translating)
- 5.0) [OpenTTD features](#50-openttd-features)
+- 3.0) [Licensing](#30-licensing)
-    - 5.1) [Logging of potentially dangerous actions](#51-logging-of-potentially-dangerous-actions)
+- 4.0) [Credits](#40-credits)
    - 5.2) [Frame rate and performance metrics](#52-frame-rate-and-performance-metrics)
 - 6.0) [Configuration file](#60-configuration-file)
 - 7.0) [Translating](#70-translating)
    - 7.1) [Translation](#71-translation)
    - 7.2) [Previewing](#72-previewing)
 - 8.0) [Troubleshooting](#80-troubleshooting)
 - 9.0) [Licensing](#90-licensing)
 - X.X) [Credits](#xx-credits)
 ## 1.0) About
-OpenTTD is a transport simulation game based upon the popular game Transport
+OpenTTD is a transport simulation game based upon the popular game Transport Tycoon Deluxe, written by Chris Sawyer.
-Tycoon Deluxe, written by Chris Sawyer. It attempts to mimic the original
+It attempts to mimic the original game as closely as possible while extending it with new features.
 game as closely as possible while extending it with new features.
-OpenTTD is licensed under the GNU General Public License version 2.0,
+OpenTTD is licensed under the GNU General Public License version 2.0, but includes some 3rd party software under different licenses.
-but includes some 3rd party software under different licenses. See the
+See the section ["Licensing"](#30-licensing) below for details.
 section "Licensing" below for details.
-## 1.1) Compiling OpenTTD
+## 1.1) Downloading OpenTTD
-Instructions for compiling OpenTTD can be found in [./COMPILING.md](COMPILING.md)
+OpenTTD can be downloaded from the [official OpenTTD website](https://www.openttd.org/).
-## 1.2) Contributing to OpenTTD
+Both 'stable' and 'nightly' versions are available for download:
-We welcome contributors to OpenTTD.  More information for contributors can be found in [./CONTRIBUTING.md](CONTRIBUTING.md)
+- most people should choose the 'stable' version, as this has been more extensively tested
 - the 'nightly' version includes the latest changes and features, but may sometimes be less reliable
-## 2.0) Contacting
+On some platforms OpenTTD will also be available via your OS package manager or a similar service.
 The easiest way to contact the OpenTTD team is by submitting bug reports or
 posting comments in our forums. You can also chat with us on IRC (#openttd
 on irc.oftc.net).
-The OpenTTD homepage is https://www.openttd.org.
+## 1.2) OpenTTD gameplay manual
-You can also find the OpenTTD forums at
+OpenTTD has a [community-maintained wiki](https://wiki.openttd.org/), including a gameplay manual and tips.
 [https://www.tt-forums.net](https://www.tt-forums.net/viewforum.php?f=55).
 ### 2.1) Reporting bugs
-First of all, check whether the bug is not already known. Do this by looking
+## 1.3) Supported platforms
 through the file called 'known-bugs.txt' which is distributed with OpenTTD
 like this readme.
-For tracking our bugs we are using GitHub's issue tracker. You can find
+OpenTTD has been ported to several platforms and operating systems.
 the tracker at https://github.com/OpenTTD/OpenTTD/issues. Before actually
 reporting take a look through the already reported bugs there to see if
 the bug is already known. The 'known-bugs.txt' file might be a bit outdated
 at the moment you are reading it as only bugs known before the release
 are documented there. Also look through the recently closed bugs.
-When you are sure it is not already reported you should:
+The currently working platforms are:
 - Make sure you are running a recent version, i.e. run the latest stable or
   nightly based on where you found the bug.
 - Make sure you are not running a non-official binary, like a patch pack.
   When you are playing with a patch pack you should report any bugs to the
   forum thread related to that patch pack.
 - Make it reproducible for the developers. In other words, create a savegame
   in which you can reproduce the issue once loaded. It is very useful to give
   us the crash.dmp, crash.sav, crash.log and crash screenshot which are
   created on crashes.
 - Check whether the bug is already reported on our bug tracker. This includes
   searching for recently closed bug reports as the bug might already be fixed.
 After you have done all that you can report the bug. Please include the
 following information in your bug report:
 - OpenTTD version (PLEASE test the latest Git revision/nightly build)
 - Bug details, including instructions how to reproduce it
 - Platform (Windows, Linux, FreeBSD, …) and compiler (including version) if
   you compiled OpenTTD yourself.
 - The processor architecture of your OS (32-bit Windows, 64-bit Windows,
   Linux on an ARM, Mac OS X on a PowerPC, etc.)
 - Attach a saved game **and** a screenshot if possible
 - If this bug only occurred recently please note the last version without
   the bug and the first version including the bug. That way we can fix it
   quicker by looking at the changes made.
 - Attach crash.dmp, crash.log and crash.sav. These files are usually created
   next to your openttd.cfg. The crash handler will tell you the location.
 ### 2.2) Reporting desyncs
 As desyncs are hard to make reproducible OpenTTD has the ability to log all
 actions done by clients so we can replay the whole game in an effort to make
 desyncs better reproducible. You need to turn this ability on. When turned
 on an automatic savegame will be made once the map has been constructed in
 the 'save/autosave' directory, see OpenTTD directories to know where to find
 this directory. Furthermore the log file 'commands-out.log' will be created
 and all actions will be written to there.
 To enable the desync debugging you need to set the debug level for 'desync'
 to at least 1. You do this by starting OpenTTD with '`-d desync=<level>`' as
 parameter or by typing '`debug_level desync=<level>`' in OpenTTD's internal
 console.
 The desync debug levels are:
 - 0: nothing.
 - 1: dumping of commands to 'commands-out.log'.
 - 2: same as 1 plus checking vehicle caches and dumping that too.
 - 3: same as 2 plus monthly saves in autosave.
 - 4 and higher: same as 3
 Restarting OpenTTD will overwrite 'commands-out.log'. OpenTTD will not remove
 the savegames (dmp_cmds_*.sav) made by the desync debugging system, so you
 have to occasionally remove them yourself!
 The naming format of the desync savegames is as follows:
 dmp_cmds_XXXXXXXX_YYYYYYYY.sav. The XXXXXXXX is the hexadecimal representation
 of the generation seed of the game and YYYYYYYY is the hexadecimal
 representation of the date of the game. This sorts the savegames by game and
 then by date making it easier to find the right savegames.
 When a desync has occurred with the desync debugging turned on you should file
 a bug report with the following files attached:
 - commands-out.log as it contains all the commands that were done
 - the last saved savegame (search for the last line beginning with
   'save: dmp_cmds_' in commands-out.log). We use this savegame to check
   whether we can quickly reproduce the desync. Otherwise we will need …
 - the first saved savegame (search for the first line beginning with 'save'
   where the first part, up to the last underscore '_', is the same). We need
   this savegame to be able to reproduce the bug when the last savegame is not
   old enough. If you loaded a scenario or savegame you need to attach that.
 - optionally you can attach the savegames from around 50%, 75%, 85%, 90% and
   95% of the game's progression. We can use these savegames to speed up the
   reproduction of the desync, but we should be able to reproduce these
   savegames based on the first savegame and commands-out.log.
 - in case you use any NewGRFs you should attach the ones you used unless
   we can easily find them ourselves via bananas or when they are in the
   #openttdcoop pack.
 Do NOT remove the dmp_cmds savegames of a desync you have reported until the
 desync has been fixed; if you, by accident, send us the wrong savegames we
 will not be able to reproduce the desync and thus will be unable to fix it.
 ## 3.0) Supported platforms
 OpenTTD has been ported to several platforms and operating systems. It should
 not be very difficult to port it to a new platform. The currently working
 platforms are:
 - FreeBSD (SDL)
 - Haiku (SDL)
- Linux (SDL or Allegro)
+- Linux (SDL)
 - macOS (universal) (Cocoa video and sound drivers)
 - OpenBSD (SDL)
 - OS/2 (SDL)
- Windows (Win32 GDI (faster) or SDL or Allegro)
+- Windows (Win32 GDI (faster) or SDL)
-## 4.0) Installing and running OpenTTD
+### 1.3.1) Legacy support
 Platforms, languages and compilers change.
 We'll keep support going on old platforms as long as someone is interested in supporting them, except where it means the project can't move forward to keep up with language and compiler features.
-Installing OpenTTD is fairly straightforward. Either you have downloaded an
+We guarantee that every revision of OpenTTD will be able to load savegames from every older revision (excepting where the savegame is corrupt).
-archive which you have to extract to a directory where you want OpenTTD to
+Please report a bug if you find a save that doesn't load.
 be installed, or you have downloaded an installer, which will automatically
 extract OpenTTD in the given directory.
-OpenTTD looks in multiple locations to find the required data files (described
+## 1.4) Installing and running OpenTTD
 in section 4.2). Installing any 3rd party files into a 'shared' location has
 the advantage that you only need to do this step once, rather than copying the
 data files into all OpenTTD versions you have.
-Savegames, screenshots, etc are saved relative to the config file (openttd.cfg)
+OpenTTD is usually straightforward to install, but for more help the wiki [includes an installation guide](https://wiki.openttd.org/Installation).
 currently being used. This means that if you use a config file in one of the
 shared directories, savegames will reside in the save/ directory next to the
 openttd.cfg file there.
-If you want savegames and screenshots in the directory where the OpenTTD binary
+OpenTTD needs some additional graphics and sound files to run.
 resides, simply have your config file in that location. But if you remove this
 config file, savegames will still be in this directory (see notes in
 section 4.2 'OpenTTD directories')
-OpenTTD comes without AIs, so if you want to play with AIs you have to download
+For some platforms these will be downloaded during the installation process if required.
 them. The easiest way is via the 'Check Online Content' button in the main menu.
 You can select some AIs that you think are compatible with your playing style.
 Another way is manually downloading the AIs from the forum although then you
 need to make sure that you install all the required AI libraries too; they get
 automatically selected (and downloaded) if you get the AIs via the 'Check
 Online Content'. If you do not have an AI but have configured OpenTTD to start
 an AI a message will be shown that the 'dummy' AI has been started.
-### 4.1) (Required) 3rd party files
+For some platforms, you will need to refer to [the installation guide](https://wiki.openttd.org/Installation).
 Before you run OpenTTD, you need to put the game's data files into a baseset/
 directory which can be located in various places addressed in the following
 section.
-For OpenTTD you need to acquire some third party data files. For this you have
+### 1.4.1) Free graphics and sound files
 the choice of using the original Transport Tycoon Deluxe data files or a set
 of free data files.
 Do NOT copy files included with OpenTTD into 'shared' directories (explained in
 the following sections) as sooner or later you will run into graphical glitches
 when using other versions of the game.
 #### 4.1.1) Free graphics and sound files
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
 OpenMSX for music can be found at:
@@ -223,12 +86,13 @@ OpenMSX for music can be found at:
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.
 #### 4.1.2) Original Transport Tycoon Deluxe graphics and sound files
-If you want to play with the original Transport Tycoon Deluxe data files you
+### 1.4.2) Original Transport Tycoon Deluxe graphics and sound files
-have to copy the data files from the CD-ROM into the baseset/ directory. It
+
-does not matter whether you copy them from the DOS or Windows version of
+If you want to play with the original Transport Tycoon Deluxe data files you have to copy the data files from the CD-ROM into the baseset/ directory.
-Transport Tycoon Deluxe. The Windows install can optionally copy these files.
+It does not matter whether you copy them from the DOS or Windows version of Transport Tycoon Deluxe.
 The Windows install can optionally copy these files.
 You need to copy the following files:
 - sample.cat
 - trg1r.grf or TRG1.GRF
@@ -237,469 +101,113 @@ You need to copy the following files:
 - trgir.grf or TRGI.GRF
 - trgtr.grf or TRGT.GRF
 #### 4.1.3) Original Transport Tycoon Deluxe music
-If you want the Transport Tycoon Deluxe music, copy the appropriate files from
+### 1.4.3) Original Transport Tycoon Deluxe music
-the original game into the baseset folder.
+
 If you want the Transport Tycoon Deluxe music, copy the appropriate files from the original game into the baseset folder.
 - TTD for Windows: All files in the gm/ folder (gm_tt00.gm up to gm_tt21.gm)
 - TTD for DOS: The GM.CAT file
 - Transport Tycoon Original: The GM.CAT file, but rename it to GM-TTO.CAT
-#### 4.1.4) AIs
+
-
+## 1.5) Add-on content / mods
-If you want AIs use the in-game content downloader. If for some reason that is
+
-not possible or you want to use an AI that has not been uploaded to the content
+OpenTTD features multiple types of add-on content, which modify gameplay in different ways.
-download system download the tar file and place it in the ai/ directory. If the
+
-AI needs libraries you will have to download those too and put them in the
+Most types of add-on content can be downloaded within OpenTTD via the 'Check Online Content' button in the main menu.
-ai/library/ directory. All AIs and AI Libraries that have been uploaded to
+
-the content download system can be found at https://noai.openttd.org/downloads.
+Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/OpenTTD) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
-The AIs and libraries can be found their in the form of .tar.gz packages.
+
-OpenTTD can read inside tar files but it does not extract .tar.gz files by itself.
+### 1.5.1) AI opponents
-
+
-To figure out which libraries you need for an AI you have to start the AI and
+OpenTTD comes without AI opponents, so if you want to play with AIs you have to download them.
-wait for an error message to pop up. The error message will tell you
+
-'could not find library "lib-name"'. Download that library and try again.
+The easiest way is via the 'Check Online Content' button in the main menu.
-
+
-#### 4.1.5) Game scripts
+You can select some AIs that you think are compatible with your playing style.
-
+
-If you want an extra challenge in OpenTTD you can download so-called game
+AI help and discussions may also be found in the [AI section of the forum](https://www.tt-forums.net/viewforum.php?f=65).
-scripts via the in-game content downloader. These game scripts have varying
+
-functionality, though they can generally influence town growth, subsidies, add
+### 1.5.2) Scenarios and height maps
-goals to reach or provide a different ranking system.
+
-
+Scenarios and heightmaps can be added via the 'Check Online Content' button in the main menu.
-If you download a game script manually you have to follow the same rules as for
+
-AIs, except that game scripts are placed in the game/ directory instead of the
+### 1.5.3) NewGRFs
-ai/ directory.
+
-
+A wide range of add-content is available as NewGRFs, including vehicles, industries, stations, landscape objects, town names and more.
-### 4.2) OpenTTD directories
+
-
+NewGRFs can be added via the 'Check Online Content' button in the main menu.
-OpenTTD uses its own directory to store its required 3rd party base set files
+
-(see section 4.1 'Required 3rd party files') and non-compulsory extension and
+See also the wiki [guide to NewGRFs](https://wiki.openttd.org/NewGRF) and [the forum graphics development section](https://www.tt-forums.net/viewforum.php?f=66).
-configuration files. See below for their proper place within this OpenTTD main
+
-data directory.
+### 1.5.4) Game scripts
-
+
-The main OpenTTD directories can be found in various locations, depending on
+Game scripts can provide additional challenges or changes to the standard OpenTTD gameplay, for example setting transport goals, or changing town growth behaviour.
-your operating system:
+
-
+Game scripts can be added via the 'Check Online Content' button in the main menu.
-1. The current working directory (from where you started OpenTTD)
+
-
+See also the wiki [guide to game scripts](https://wiki.openttd.org/Game_script) and [the forum graphics game script section](https://www.tt-forums.net/viewforum.php?f=65).
-    For non-Windows operating systems OpenTTD will not scan for files in this
+
-    directory if it is your personal directory, i.e. '~/', or when it is the
+### 1.6) OpenTTD directories
-    root directory, i.e. '/'.
+
-
+OpenTTD uses its own directory structure to store game data, add-on content etc.
-2. Your personal directory
+
-    - Windows:
+For more information, see the [directory structure guide](./docs/directory_structure.md).
-        - `C:\My Documents\OpenTTD` (95, 98, ME)
+
-        - `C:\Documents and Settings\<username>\My Documents\OpenTTD` (2000, XP)
+### 1.7) Compiling OpenTTD
-        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7, 8.1, 10)
+
-    - macOS: `~/Documents/OpenTTD`
+If you want to compile OpenTTD from source, instructions can be found in [COMPILING.md](./COMPILING.md).
-    - Linux: `$XDG_DATA_HOME/openttd` which is usually `~/.local/share/openttd`
+
-       when built with XDG base directory support, otherwise `~/.openttd`
+
-3. The shared directory
+## 2.0) Contact and Community
-    - Windows:
+
-        - `C:\Documents and Settings\All Users\Shared Documents\OpenTTD` (2000, XP)
+'Official' channels
-        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7, 8.1, 10)
+
-    - macOS: `/Library/Application Support/OpenTTD`
+- [OpenTTD website](https://www.openttd.org)
-    - Linux: not available
+- IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/Irc)
-4. The binary directory (where the OpenTTD executable is)
+- [OpenTTD on Github](https://github.com/openTTD/) for code repositories and for reporting issues
-    - Windows: `C:\Program Files\OpenTTD`
+- [forum.openttd.org](https://forum.openttd.org/) - the primary community forum site for discussing OpenTTD and related games
-    - Linux: `/usr/games`
+- [OpenTTD wiki](https://wiki.openttd.org/) community-maintained wiki, including topics like gameplay guide, detailed explanation of some game mechanics, how to use add-on content (mods) and much more
-5. The installation directory (Linux only)
+
-    - Linux: `/usr/share/games/openttd`
+'Unofficial' channels
-6. The application bundle (macOS only)
+
-
+- the OpenTTD wiki has a [page listing OpenTTD communities](https://wiki.openttd.org/Community) including some in languages other than English
-    It includes the OpenTTD files (grf+lng) and it will work as long as they
+
-    are not touched
+
-
+### 2.1) Contributing to OpenTTD
-Different types of data or extensions go into different subdirectories of the
+
-chosen main OpenTTD directory:
+We welcome contributors to OpenTTD.  More information for contributors can be found in [CONTRIBUTING.md](./CONTRIBUTING.md)
-
+
-| data type           | directory         | additional info             |
+
-| ------------------- | ----------------- | --------------------------- |
+### 2.2) Reporting bugs
-| Config File         | (no subdirectory) |                             |
+
-| Screenshots         | screenshot        |                             |
+Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRIBUTING.md#bug-reports) to help with this.
-| Base Graphics       | baseset           | (or a subdirectory thereof) |
+
-| Sound Sets          | baseset           | (or a subdirectory thereof) |
+Desyncs in multiplayer are complex to debug and report (some software development skils are required).
-| NewGRFs             | newgrf            | (or a subdirectory thereof) |
+Instructions can be found in [debugging and reporting desyncs](./docs/debugging_desyncs.md).
-| 32bpp Sets          | newgrf            | (or a subdirectory thereof) |
+
-| Music Sets          | baseset           | (or a subdirectory thereof) |
+
-| AIs                 | ai                | (or a subdirectory thereof) |
+### 2.3) Translating
-| AI Libraries        | ai/library        | (or a subdirectory thereof) |
+
-| Game Scripts (GS)   | game              | (or a subdirectory thereof) |
+OpenTTD is translated into many languages.  Translations are added and updated via the [online translation tool](https://translator.openttd.org).
-| GS Libraries        | game/library      | (or a subdirectory thereof) |
+
-| Savegames           | save              |                             |
+
-| Automatic Savegames | save/autosave     |                             |
+## 3.0) Licensing
-| Scenarios           | scenario          |                             |
+
-
+OpenTTD is licensed under the GNU General Public License version 2.0.
-The (automatically created) directory content_download is for OpenTTD's internal
+For the complete license text, see the file '[COPYING.md](./COPYING.md)'.
-use and no files should be added to it or its subdirectories manually.
+This license applies to all files in this distribution, except as noted below.
-
+
-#### Notes:
+The squirrel implementation in `src/3rdparty/squirrel` is licensed under the Zlib license.
-
+See `src/3rdparty/squirrel/COPYRIGHT` for the complete license text.
- Linux in the previous list means .deb, but most paths should be similar for
+
-   others.
+The md5 implementation in `src/3rdparty/md5` is licensed under the Zlib license.
- The previous search order is also used for NewGRFs and openttd.cfg.
+See the comments in the source files in `src/3rdparty/md5` for the complete license text.
- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
+
-   5 order. When built with XDG base directory support, openttd.cfg will be
+The implementations of Posix `getaddrinfo` and `getnameinfo` for OS/2 in `src/3rdparty/os2` are distributed partly under the GNU Lesser General Public License 2.1, and partly under the (3-clause) BSD license.
-   created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
+The exact licensing terms can be found in `src/3rdparty/os2/getaddrinfo.c` resp. `src/3rdparty/os2/getnameinfo.c`.
- Savegames will be relative to the config file only if there is no save/
+
-   directory in paths with higher priority than the config file path, but
+
-   autosaves and screenshots will always be relative to the config file.
+## 4.0 Credits
-   Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
+
-   other files will be saved under $XDG_DATA_HOME/openttd.
+See [CREDITS.md](./CREDITS.md)
 #### The preferred setup:
 Place 3rd party files in shared directory (or in personal directory if you do
 not have write access on shared directory) and have your openttd.cfg config
 file in personal directory (where the game will then also place savegames and
 screenshots).
 ### 4.3) Portable installations (portable media)
 You can install OpenTTD on external media so you can take it with you, i.e.
 using a USB key, or a USB HDD, etc.
 Create a directory where you shall store the game in (i.e. OpenTTD/).
 Copy the binary (OpenTTD.exe, OpenTTD.app, openttd, etc), baseset/ and your
 openttd.cfg to this directory.
 You can copy binaries for any operating system into this directory, which will
 allow you to play the game on nearly any computer you can attach the external
 media to.
 As always - additional grf files are stored in the newgrf/ dir (for details,
 again, see section 4.1).
 ### 4.4) Files in tar (archives)
 OpenTTD can read files that are in an uncompressed tar (archive), which
 makes it easy to bundle files belonging to the same script, NewGRF or base
 set. Music sets are the only exception as they cannot be stored in a tar
 file due to being played by external applications.
 OpenTTD sees each tar archive as the 'root' of its search path. This means that
 having a file with the same path in two different tar files means that one
 cannot be opened, after all only one file will be found first. As such it is
 advisable to put an uniquely named folder in the root of the tar and put all the
 content in that folder. For example, all downloaded content has a path that
 concatenates the name of the content and the version, which makes the path
 unique. For custom tar files it is advised to do this as well.
 The normal files are also referred to by their relative path from the search
 directory, this means that also normal files could hide files in a tar as
 long as the relative path from the search path of the normal file is the
 same as the path in the tar file. Again it is advised to have an unique path
 to the normal file so they do not collide with the files from other tar
 files.
 ## 5.0) OpenTTD features
 OpenTTD has a lot of features going beyond the original Transport Tycoon Deluxe
 emulation. Unfortunately, there is currently no comprehensive list of features,
 but there is a basic features list on the web, and some optional features can be
 controlled through the Advanced Settings dialog. We also implement some
 features known from [TTDPatch](https://www.ttdpatch.net).
 Several important non-standard controls:
 - Ctrl modifies many commands and makes them more powerful. For example Ctrl
   clicking on signals with the build signal tool changes their behaviour,
   holding Ctrl while the track build tool is activated changes it to the track
   removal tool, and so on. See https://wiki.openttd.org/Hidden_features
   for a non-comprehensive list or look at the tooltips.
 - Ingame console. More information at https://wiki.openttd.org/Console
 - Hovering over a GUI element shows tooltips. This can be changed to right click
   via the advanced settings.
 ### 5.1) Logging of potentially dangerous actions
 OpenTTD is a complex program, and together with NewGRF, it may show a buggy
 behaviour. But not only bugs in code can cause problems. There are several
 ways to affect game state possibly resulting in program crash or multiplayer
 desyncs.
 Easier way would be to forbid all these unsafe actions, but that would affect
 game usability for many players. We certainly do not want that.
 However, we receive bug reports because of this. To reduce time spent with
 solving these problems, these potentially unsafe actions are logged in
 the savegame (including crash.sav). Log is stored in crash logs, too.
 Information logged:
 - Adding / removing / changing order of NewGRFs
 - Changing NewGRF parameters, loading compatible NewGRF
 - Changing game mode (scenario editor <-> normal game)
 - Loading game saved in a different OpenTTD / TTDPatch / Transport Tycoon Deluxe /
   original Transport Tycoon version
 - Running a modified OpenTTD build
 - Changing settings affecting NewGRF behaviour (non-network-safe settings)
 - Triggering NewGRF bugs
 No personal information is stored.
 You can show the game log by typing 'gamelog' in the console or by running
 OpenTTD in debug mode.
 ### 5.2) Frame rate and performance metrics
 The Help menu in-game has a function to open the Frame rate window. This
 window shows various real-time performance statistics, measuring what parts
 of the game require the most processing power currently.
 A summary of the statistics can also be retrieved from the console with the
 `fps` command. This is especially useful on dedicated servers, where the
 administrator might want to determine what's limiting performance in a slow
 game.
 The frame rate is given as two figures, the simulation rate and the graphics
 frame rate. Usually these are identical, as the screen is rendered exactly
 once per simulated tick, but in the future there might be support for graphics
 and simulation running at different rates. When the game is paused, the
 simulation rate drops to zero.
 In addition to the simulation rate, a game speed factor is also calculated.
 This is based on the target simulation speed, which is 30 milliseconds per
 game tick. At that speed, the expected frame rate is 33.33 frames/second, and
 the game speed factor is how close to that target the actual rate is. When
 the game is in fast forward mode, the game speed factor shows how much
 speed up is achieved.
 The lower part of the window shows timing statistics for individual parts of
 the game. The times shown are short-term and long-term averages of how long
 it takes to process one tick of game time, all figures are in milliseconds.
 Clicking a line in the lower part of the window opens a graph window, giving
 detailed readings on each tick simulated by the game.
 The following is an explanation of the different statistics:
 - *Game loop* - Total processing time used per simulated "tick" in the game.
  This includes all pathfinding, world updates, and economy handling.
 - *Cargo handling* - Time spent loading/unloading cargo at stations, and
  industries and towns sending/retrieving cargo from stations.
 - *Train ticks*, *Road vehicle ticks*, *Ship ticks*, *Aircraft ticks* -
  Time spent on pathfinding and other processing for each player vehicle type.
 - *World ticks* - Time spent on other world/landscape processing. This
  includes towns growing, building animations, updates of farmland and trees,
  and station rating updates.
 - *GS/AI total*, *Game script*, and *AI players* - Time spent running logic
  for game scripts and AI players. The total may show as less than the current
  sum of the individual scripts, this is because AI players at lower
  difficulty settings do not run every game tick, and hence contribute less
  to the average across all ticks. Keep in mind that the "Current" figure is
  also an average, just only over short term.
 - *Link graph delay* - Time overruns of the cargo distribution link graph
  update thread. Usually the link graph is updated in a background thread,
  but these updates need to synchronise with the main game loop occasionally,
  if the time spent on link graph updates is longer than the time taken to
  otherwise simulate the game while it was updating, these delays are counted
  in this figure.
 - *Graphics rendering* - Total time spent rendering all graphics, including
  both GUI and world viewports. This typically spikes when panning the view
  around, and when more things are happening on screen at once.
 - *World viewport rendering* - Isolated time spent rendering just world
  viewports. If this figure is significantly lower than the total graphics
  rendering time, most time is spent rendering GUI than rendering world.
 - *Video output* - Speed of copying the rendered graphics to the display
  adapter. Usually this should be very fast (in the range of 0-3 ms), large
  values for this can indicate a graphics driver problem.
 - *Sound mixing* - Speed of mixing active audio samples together. Usually
  this should be very fast (in the range of 0-3 ms), if it is slow, consider
  switching to the NoSound set.
 If the frame rate window is shaded, the title bar will instead show just the
 current simulation rate and the game speed factor.
 ## 6.0) Configuration file
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
 .INI format. It is mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
 When you cannot find openttd.cfg you should look in the directories as
 described in section 4.2. If you do not have an openttd.cfg OpenTTD will
 create one after closing.
 ## 7.0) Translating
 See https://www.openttd.org/development for up-to-date information.
 The use of the online Translator service, located at
 https://translator.openttd.org, is highly encouraged. For getting an account
 simply follow the guidelines in the FAQ of the translator website.
 If for some reason the website is down for a longer period of time, the
 information below might be of help.
 Please contact the translations manager (https://www.openttd.org/contact)
 before beginning the translation process! This avoids double work, as
 someone else may have already started translating to the same language.
 ### 7.1) Translation
 So, now that you have notified the development team about your intention to
 translate (You did, right? Of course you did.) you can pick up english.txt
 (found in the Git repository under /src/lang) and translate.
 You must change the first two lines of the file appropriately:
    ##name English-Name-Of-Language
    ##ownname Native-Name-Of-Language
 Note: Do not alter the following parts of the file:
 - String identifiers (the first word on each line)
 - Parts of the strings which are in curly braces (such as {STRING})
 - Lines beginning with ## (such as ##id), other than the first two lines
   of the file
 ### 7.2) Previewing
 In order to view the translation in the game, you need to compile your language
 file with the strgen utility. As this utility is tailored to a specific OpenTTD
 version, you need to compile it yourself. Just take the normal OpenTTD sources
 and build that. During the build process the strgen utility will be made.
 strgen is a command-line utility. It takes the language filename as parameter.
 Example:
    strgen lang/german.txt
 This results in compiling german.txt and produces another file named german.lng.
 Any missing strings are replaced with the English strings. Note that it looks
 for english.txt in the lang subdirectory, which is where your language file
 should also be.
 That is all! You should now be able to select the language in the game options.
 ## 8.0) Troubleshooting
 To see all startup options available to you, start OpenTTD with the
 '`./openttd -h`' option. This might help you tweak some of the settings.
 If the game is acting strange and you feel adventurous you can try the
 '`-d [[<name>=]<level>]`' flag, where the higher levels will give you more
 debugging output. The 'name' variable can help you to display only some type of
 debugging messages. This is mostly undocumented so best is to look in the
 source code file debug.c for the various debugging types. For more information
 look at https://wiki.openttd.org/Command_line.
 The most frequent problem is missing data files. Please install OpenGFX and
 possibly OpenSFX and OpenMSX. See section 4.1.1 for more information.
 Under certain circumstance, especially on Ubuntu OpenTTD can be extremely slow
 and/or freeze. See known-bugs.txt for more information and how to solve this
 problem on your computer.
 Under Windows 98 and lower it is impossible to use a dedicated server; it will
 fail to start. Perhaps this is for the better because those OSes are not known
 for their stability.
 With the added support for font-based text selecting a non-latin language can
 result in lots of question marks ('?') being shown on screen. Please open your
 configuration file (openttd.cfg - see Section 4.2 for where to find it)
 and add a suitable font for the small, medium and / or large font, e.g.:
    small_font = "Tahoma"
    medium_font = "Tahoma"
    large_font = "Tahoma"
 You should use a font name like 'Tahoma' or a path to the desired font.
 Any NewGRF file used in a game is stored inside the savegame and will refuse to
 load if you do not have that NewGRF file available. A list of missing files can
 be viewed in the NewGRF window accessible from the file load dialogue window.
 You can try to obtain the missing files from that NewGRF dialogue or – if they
 are not available online – you can search manually through our
 [forum's graphics development section](https://www.tt-forums.net/viewforum.php?f=66)
 or [GRFCrawler](https://grfcrawler.tt-forums.net). Put the NewGRF files in
 OpenTTD's newgrf folder (see section 4.2 'OpenTTD directories') and rescan the
 list of available NewGRFs. Once you have all missing files, you are set to go.
 ## 9.0) Licensing
 OpenTTD is licensed under the GNU General Public License version 2.0. For
 the complete license text, see the file 'COPYING.md'. This license applies
 to all files in this distribution, except as noted below.
 The squirrel implementation in src/3rdparty/squirrel is licensed under
 the Zlib license. See src/3rdparty/squirrel/COPYRIGHT for the complete
 license text.
 The md5 implementation in src/3rdparty/md5 is licensed under the Zlib
 license. See the comments in the source files in src/3rdparty/md5 for
 the complete license text.
 The implementations of Posix getaddrinfo and getnameinfo for OS/2 in
 src/3rdparty/os2 are distributed partly under the GNU Lesser General Public
 License 2.1, and partly under the (3-clause) BSD license. The exact licensing
 terms can be found in src/3rdparty/os2/getaddrinfo.c resp.
 src/3rdparty/os2/getnameinfo.c.
 CONTRIBUTING.md is adapted from
 [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md)
 under the [Creative Commons Attribution 3.0 Unported
 License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE)
 terms for Bootstrap documentation.
 ## X.X) Credits
 ### The OpenTTD team (in alphabetical order):
 - Grzegorz Duczyński (adf88) - General coding (since 1.7.2)
 - Albert Hofkamp (Alberth) - GUI expert (since 0.7)
 - Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)
 - Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)
 - Christoph Elsenhans (frosch) - General coding (since 0.6)
 - Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
 - Charles Pigott (LordAro) - General / Correctness police (since 1.9)
 - Michael Lutz (michi_cc) - Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
 - Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
 - Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
 - José Soler (Terkhen) - General coding (since 1.0)
 - Leif Linse (Zuu) - AI/Game Script (since 1.2)
 ### Inactive Developers:
 - Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
 - Bjarni Corfitzen (Bjarni) - macOS port, coder and vehicles (0.3 - 0.7)
 - Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
 - Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
 - Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
 - Attila Bán (MiHaMiX) - WebTranslator 1 and 2 (0.3 - 0.5)
 - Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
 - Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
 - Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
 - Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
 ### Retired Developers:
 - Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
 - Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
 - Emil Djupfeld (egladil) - macOS port (0.4 - 0.6)
 - Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
 - Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
 - Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
 - Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
 - Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
 - Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)
 ### Thanks to:
 - Josef Drexler - For his great work on TTDPatch.
 - Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and track foundations
 - Stefan Meißner (sign_de) - For his work on the console
 - Mike Ragsdale - OpenTTD installer
 - Christian Rosentreter (tokai) - MorphOS / AmigaOS port
 - Richard Kempton (RichK67) - Additional airports, initial TGP implementation
 - Alberto Demichelis - Squirrel scripting language
 - L. Peter Deutsch - MD5 implementation
 - Michael Blunck - For revolutionizing TTD with awesome graphics
 - George - Canal graphics
 - Andrew Parkhouse (andythenorth) - River graphics
 - David Dallaston (Pikka) - Tram tracks
 - All Translators - For their support to make OpenTTD a truly international game
 - Bug Reporters - Thanks for all bug reports
 - Chris Sawyer - For an amazing game!
--- a/azure-pipelines/changelog.sh
+++ b/azure-pipelines/changelog.sh
@@ -4,9 +4,9 @@ tag=$(git describe --tags 2>/dev/null)
 # If we are a tag, show the part of the changelog till (but excluding) the last stable
 if [ -n "$tag" ]; then
-    grep='^[0-9]\.[0-9]\.[0-9][^-]'
+    grep='^[0-9]\+\.[0-9]\+\.[0-9]\+[^-]'
    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
-    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9].[0-9].[0-9]/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
+    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
    exit 0
 fi
--- a/azure-pipelines/manifest.sh
+++ b/azure-pipelines/manifest.sh
@@ -31,29 +31,55 @@ DATE=$(cat .release_date | tr ' ' T | sed 's/TUTC/:00-00:00/')
 VERSION=$(cat .version)
 BASE="openttd-${VERSION}"
-echo "name: ${NAME}" >> manifest.yaml
+echo "name: ${NAME}" > manifest.yaml
 echo "date: ${DATE}" >> manifest.yaml
 echo "base: ${BASE}-" >> manifest.yaml
 echo "files:" >> manifest.yaml
 error=""
 for i in $(ls ${FOLDER} | grep -v ".txt$\|.md$\|sum$" | sort); do
    if [ -n "$(echo $i | grep pdb.xz)" ]; then continue; fi
    if [ -n "$(echo $i | grep dbg.deb)" ]; then continue; fi
-    if [ ! -e ${FOLDER}/$i.md5sum ] || [ ! -e ${FOLDER}/$i.sha1sum ] || [ ! -e ${FOLDER}/$i.sha256sum ]; then
+FILES=
-        echo "ERROR: missing checksum file for ${i}" 1>&2
+DEV_FILES=
-        error="y"
+for filename in $(ls ${FOLDER} | grep -v ".txt$\|.md$\|sum$" | sort); do
-        continue
+    case ${filename} in
-    fi
+        *docs*   |\
        *source* |\
        *dbg.deb |\
        *pdb.xz  )
            DEV_FILES="${DEV_FILES} ${filename}"
            ;;
-    echo "- id: $i" >> manifest.yaml
+        *)
-    echo "  size: $(stat -c"%s" ${FOLDER}/$i)" >> manifest.yaml
+            FILES="${FILES} ${filename}"
-    echo "  md5sum: $(cat ${FOLDER}/$i.md5sum | cut -d\  -f1)" >> manifest.yaml
+            ;;
-    echo "  sha1sum: $(cat ${FOLDER}/$i.sha1sum | cut -d\  -f1)" >> manifest.yaml
+    esac
    echo "  sha256sum: $(cat ${FOLDER}/$i.sha256sum | cut -d\  -f1)" >> manifest.yaml
 done
 # output_files key filename...
 output_files() {
    if [ "$#" -lt 2 ]; then return; fi
    key=$1
    echo "${key}:" >> manifest.yaml
    shift
    while [ "$#" -gt 0 ]; do
        filename=$1
        if [ ! -e ${FOLDER}/${filename}.md5sum ] || [ ! -e ${FOLDER}/${filename}.sha1sum ] || [ ! -e ${FOLDER}/${filename}.sha256sum ]; then
            echo "ERROR: missing checksum file for ${filename}" 1>&2
            error="y"
            continue
        fi
        echo "- id: ${filename}" >> manifest.yaml
        echo "  size: $(stat -c"%s" ${FOLDER}/${filename})" >> manifest.yaml
        echo "  md5sum: $(cat ${FOLDER}/${filename}.md5sum | cut -d\  -f1)" >> manifest.yaml
        echo "  sha1sum: $(cat ${FOLDER}/${filename}.sha1sum | cut -d\  -f1)" >> manifest.yaml
        echo "  sha256sum: $(cat ${FOLDER}/${filename}.sha256sum | cut -d\  -f1)" >> manifest.yaml
        shift
    done
 }
 output_files files ${FILES}
 output_files dev_files ${DEV_FILES}
 if [ -n "${error}" ]; then
    echo "ERROR: exiting due to earlier errors" 1>&2
    exit 1
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.10.nut
+++ b/bin/ai/compat_1.10.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.2.nut
+++ b/bin/ai/compat_1.2.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.3.nut
+++ b/bin/ai/compat_1.3.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.4.nut
+++ b/bin/ai/compat_1.4.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.5.nut
+++ b/bin/ai/compat_1.5.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.6.nut
+++ b/bin/ai/compat_1.6.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.7.nut
+++ b/bin/ai/compat_1.7.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.8.nut
+++ b/bin/ai/compat_1.8.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.9.nut
+++ b/bin/ai/compat_1.9.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/regression/completeness.sh
+++ b/bin/ai/regression/completeness.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 if ! [ -f ai/regression/completeness.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 if ! [ -f ai/regression/run.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
--- a/bin/ai/regression/run.vbs
+++ b/bin/ai/regression/run.vbs
@@ -1,7 +1,5 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/bin/ai/regression/tst_regression/main.nut
+++ b/bin/ai/regression/tst_regression/main.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIController {
 	function Start();
 };
--- a/bin/ai/regression/tst_regression/require.nut
+++ b/bin/ai/regression/tst_regression/require.nut
@@ -1,4 +1,2 @@
 /* $Id$ */
 print("  Required this file");
--- a/bin/ai/regression/tst_stationlist/main.nut
+++ b/bin/ai/regression/tst_stationlist/main.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIController {
 	function Start();
 };
--- a/bin/game/compat_1.10.nut
+++ b/bin/game/compat_1.10.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.5.nut
+++ b/bin/game/compat_1.5.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.8.nut
+++ b/bin/game/compat_1.8.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.9.nut
+++ b/bin/game/compat_1.9.nut
@@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,28 @@
 1.10.0-beta2 (2019-12-25)
 ------------------------------------------------------------------------
 - Feature: [Script] More error mappings (#7857)
 - Feature: Ctrl+Click on a vehicle in the vehicle group window selects and scrolls to the vehicle's group (#7800)
 - Feature: Ctrl+Click on the vehicle details button in the vehicle view window opens the vehicle group window focused on the vehicle (#7800)
 - Feature: Add a button to the vehicle advisory news window to open the vehicle's group window (#7800)
 - Feature: Ctrl+Click on a vehicle in the vehicle list window opens the vehicle group window focused on the vehicle's group (#7800)
 - Fix: Custom sea level default value is now equal to minimum value (#7866)
 - Fix: [NewGRF] Various tracktype fixes (#7863)
 - Fix: Infrastructure total update when removing tram road stop (#7856)
 - Fix #7847: Use ViewportSign coordinates for sign Kdtree coordinates (#7849)
 - Fix #7836: Check coherency of NewGRF parameter min/max (#7840)
 - Fix #7673: [Script] Allow removal of custom town text (#7834)
 - Fix: Crash when displaying an error message at map edges (#7833)
 - Fix #7783, #7816: [SDL2] Fix input handling in edit context (#7825)
 - Fix #7697: Tile query on HQs did not display cargo correctly (#7824)
 - Fix #7820: Possible game crash when removing oil rig (#7821)
 - Fix #7606: Rare crash when trying to clean up a crashed script (#7819)
 - Fix #7784: [SDL2] up/down/home/end key behaviour (#7815)
 - Fix #7631: 16 out cargo support for industry directory (#7809)
 - Fix #7646: Crash on random map generation failure (#7805)
 - Fix #7430: Only reset time since pickup when train visits station if it has room to load (#7595)
 - Fix #5405: Aircraft could route to depots outside their range (#7104)
 1.10.0-beta1 (2019-10-29)
 ------------------------------------------------------------------------
 - Feature: Configurable minimum age for companies before allowing share trading (#7780)
@@ -11,7 +36,6 @@
 - Feature: Improved performance for road vehicle pathfinding (#7261)
 - Feature: Option to show local authority boundary of towns (#7025)
 - Feature: Experimental method of town cargo generation that scales linearly with population (#6965)
 - Feature: [NewGRF] Houses and industries can accept/produce up to 16 different cargo types (#6867, #6872)
 - Feature: [NewGRF] RoadTypes (NRT) (#6811)
 - Add: [Win32] Select MIDI device by port name (#7666)
 - Add: 'getsysdate' console command (#7658)
--- a/config.lib
+++ b/config.lib
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -1518,12 +1516,20 @@ make_cflags_and_ldflags() {
 			# extensions in a way that breaks build with at least ICC.
 			# This requires -O1 or more, so debug level 3 (-O0) is excluded.
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
 			if [ "$os" = "MINGW" ]; then
 				# Prevent undefined references when _FORTIFY_SOURCE > 0
 				LDFLAGS="$LDFLAGS -fstack-protector"
 			fi
 		fi
 		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" 2>/dev/null`
 		if [ -n "$cc_build_is_gcc" ]; then
 			# Just add -O1 to the tools needed for building.
 			CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
 			if [ "$os" = "MINGW" ]; then
 				# Prevent undefined references when _FORTIFY_SOURCE > 0
 				LDFLAGS_BUILD="$LDFLAGS_BUILD -fstack-protector"
 			fi
 		fi
 	fi
--- a/2
+++ b/2
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/docs/debugging_desyncs.md
+++ b/docs/debugging_desyncs.md
@@ -0,0 +1,56 @@
 # Debugging / reporting desyncs
 As desyncs are hard to make reproducible OpenTTD has the ability to log all
 actions done by clients so we can replay the whole game in an effort to make
 desyncs better reproducible. You need to turn this ability on. When turned
 on an automatic savegame will be made once the map has been constructed in
 the 'save/autosave' directory, see OpenTTD directories to know where to find
 this directory. Furthermore the log file 'commands-out.log' will be created
 and all actions will be written to there.
 To enable the desync debugging you need to set the debug level for 'desync'
 to at least 1. You do this by starting OpenTTD with '`-d desync=<level>`' as
 parameter or by typing '`debug_level desync=<level>`' in OpenTTD's internal
 console.
 The desync debug levels are:
 - 0: nothing.
 - 1: dumping of commands to 'commands-out.log'.
 - 2: same as 1 plus checking vehicle caches and dumping that too.
 - 3: same as 2 plus monthly saves in autosave.
 - 4 and higher: same as 3
 Restarting OpenTTD will overwrite 'commands-out.log'. OpenTTD will not remove
 the savegames (dmp_cmds_*.sav) made by the desync debugging system, so you
 have to occasionally remove them yourself!
 The naming format of the desync savegames is as follows:
 dmp_cmds_XXXXXXXX_YYYYYYYY.sav. The XXXXXXXX is the hexadecimal representation
 of the generation seed of the game and YYYYYYYY is the hexadecimal
 representation of the date of the game. This sorts the savegames by game and
 then by date making it easier to find the right savegames.
 When a desync has occurred with the desync debugging turned on you should file
 a bug report with the following files attached:
 - commands-out.log as it contains all the commands that were done
 - the last saved savegame (search for the last line beginning with
   'save: dmp_cmds_' in commands-out.log). We use this savegame to check
   whether we can quickly reproduce the desync. Otherwise we will need …
 - the first saved savegame (search for the first line beginning with 'save'
   where the first part, up to the last underscore '_', is the same). We need
   this savegame to be able to reproduce the bug when the last savegame is not
   old enough. If you loaded a scenario or savegame you need to attach that.
 - optionally you can attach the savegames from around 50%, 75%, 85%, 90% and
   95% of the game's progression. We can use these savegames to speed up the
   reproduction of the desync, but we should be able to reproduce these
   savegames based on the first savegame and commands-out.log.
 - in case you use any NewGRFs you should attach the ones you used unless
   we can easily find them ourselves via bananas or when they are in the
   #openttdcoop pack.
 Do NOT remove the dmp_cmds savegames of a desync you have reported until the
 desync has been fixed; if you, by accident, send us the wrong savegames we
 will not be able to reproduce the desync and thus will be unable to fix it.
--- a/docs/directory_structure.md
+++ b/docs/directory_structure.md
@@ -0,0 +1,130 @@
 # OpenTTD directory structure
 OpenTTD uses its own directory to store its required 3rd party base set files
 (see section 4.1 'Required 3rd party files') and non-compulsory extension and
 configuration files.
 See below for their proper place within this OpenTTD main data directory.
 The main OpenTTD directories can be found in various locations, depending on
 your operating system:
 1. The current working directory (from where you started OpenTTD)
    For non-Windows operating systems OpenTTD will not scan for files in this
    directory if it is your personal directory, i.e. '~/', or when it is the
    root directory, i.e. '/'.
 2. Your personal directory
    - Windows:
        - `C:\My Documents\OpenTTD` (95, 98, ME)
        - `C:\Documents and Settings\<username>\My Documents\OpenTTD` (2000, XP)
        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7, 8.1, 10)
    - macOS: `~/Documents/OpenTTD`
    - Linux: `$XDG_DATA_HOME/openttd` which is usually `~/.local/share/openttd`
       when built with XDG base directory support, otherwise `~/.openttd`
 3. The shared directory
    - Windows:
        - `C:\Documents and Settings\All Users\Shared Documents\OpenTTD` (2000, XP)
        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7, 8.1, 10)
    - macOS: `/Library/Application Support/OpenTTD`
    - Linux: not available
 4. The binary directory (where the OpenTTD executable is)
    - Windows: `C:\Program Files\OpenTTD`
    - Linux: `/usr/games`
 5. The installation directory (Linux only)
    - Linux: `/usr/share/games/openttd`
 6. The application bundle (macOS only)
    It includes the OpenTTD files (grf+lng) and it will work as long as they
    are not touched
 Different types of data or extensions go into different subdirectories of the
 chosen main OpenTTD directory:
 | data type           | directory         | additional info             |
 | ------------------- | ----------------- | --------------------------- |
 | Config File         | (no subdirectory) |                             |
 | Screenshots         | screenshot        |                             |
 | Base Graphics       | baseset           | (or a subdirectory thereof) |
 | Sound Sets          | baseset           | (or a subdirectory thereof) |
 | NewGRFs             | newgrf            | (or a subdirectory thereof) |
 | 32bpp Sets          | newgrf            | (or a subdirectory thereof) |
 | Music Sets          | baseset           | (or a subdirectory thereof) |
 | AIs                 | ai                | (or a subdirectory thereof) |
 | AI Libraries        | ai/library        | (or a subdirectory thereof) |
 | Game Scripts (GS)   | game              | (or a subdirectory thereof) |
 | GS Libraries        | game/library      | (or a subdirectory thereof) |
 | Savegames           | save              |                             |
 | Automatic Savegames | save/autosave     |                             |
 | Scenarios           | scenario          |                             |
 The (automatically created) directory content_download is for OpenTTD's internal
 use and no files should be added to it or its subdirectories manually.
 ## Notes:
 - Linux in the previous list means .deb, but most paths should be similar for
   others.
 - The previous search order is also used for NewGRFs and openttd.cfg.
 - If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
   5 order. When built with XDG base directory support, openttd.cfg will be
   created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
 - Savegames will be relative to the config file only if there is no save/
   directory in paths with higher priority than the config file path, but
   autosaves and screenshots will always be relative to the config file.
   Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
   other files will be saved under $XDG_DATA_HOME/openttd.
 ## The preferred setup:
 Place 3rd party files in shared directory (or in personal directory if you do
 not have write access on shared directory) and have your openttd.cfg config
 file in personal directory (where the game will then also place savegames and
 screenshots).
 ## Portable installations (portable media)
 You can install OpenTTD on external media so you can take it with you, i.e.
 using a USB key, or a USB HDD, etc.
 Create a directory where you shall store the game in (i.e. OpenTTD/).
 Copy the binary (OpenTTD.exe, OpenTTD.app, openttd, etc), baseset/ and your
 openttd.cfg to this directory.
 You can copy binaries for any operating system into this directory, which will
 allow you to play the game on nearly any computer you can attach the external
 media to.
 As always - additional grf files are stored in the newgrf/ dir (for details,
 again, see section 4.1).
 ## Files in tar (archives)
 OpenTTD can read files that are in an uncompressed tar (archive), which
 makes it easy to bundle files belonging to the same script, NewGRF or base
 set. Music sets are the only exception as they cannot be stored in a tar
 file due to being played by external applications.
 OpenTTD sees each tar archive as the 'root' of its search path. This means that
 having a file with the same path in two different tar files means that one
 cannot be opened, after all only one file will be found first. As such it is
 advisable to put an uniquely named folder in the root of the tar and put all the
 content in that folder. For example, all downloaded content has a path that
 concatenates the name of the content and the version, which makes the path
 unique. For custom tar files it is advised to do this as well.
 The normal files are also referred to by their relative path from the search
 directory, this means that also normal files could hide files in a tar as
 long as the relative path from the search path of the normal file is the
 same as the path in the tar file. Again it is advised to have an unique path
 to the normal file so they do not collide with the files from other tar
 files.
 ## Configuration file
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
 .INI format. It is mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
 When you cannot find openttd.cfg you should look in the directories as
 described in this document. If you do not have an openttd.cfg OpenTTD will
 create one after closing.
--- a/docs/logging_and_performance_metrics.md
+++ b/docs/logging_and_performance_metrics.md
@@ -0,0 +1,101 @@
 # Logging, frame rate and performance metrics
 ## 1.0) Logging of potentially dangerous actions
 OpenTTD is a complex program, and together with NewGRF, it may show a buggy
 behaviour. But not only bugs in code can cause problems. There are several
 ways to affect game state possibly resulting in program crash or multiplayer
 desyncs.
 Easier way would be to forbid all these unsafe actions, but that would affect
 game usability for many players. We certainly do not want that.
 However, we receive bug reports because of this. To reduce time spent with
 solving these problems, these potentially unsafe actions are logged in
 the savegame (including crash.sav). Log is stored in crash logs, too.
 Information logged:
 - Adding / removing / changing order of NewGRFs
 - Changing NewGRF parameters, loading compatible NewGRF
 - Changing game mode (scenario editor <-> normal game)
 - Loading game saved in a different OpenTTD / TTDPatch / Transport Tycoon Deluxe /
   original Transport Tycoon version
 - Running a modified OpenTTD build
 - Changing settings affecting NewGRF behaviour (non-network-safe settings)
 - Triggering NewGRF bugs
 No personal information is stored.
 You can show the game log by typing 'gamelog' in the console or by running
 OpenTTD in debug mode.
 ## 2.0) Frame rate and performance metrics
 The Help menu in-game has a function to open the Frame rate window. This
 window shows various real-time performance statistics, measuring what parts
 of the game require the most processing power currently.
 A summary of the statistics can also be retrieved from the console with the
 `fps` command. This is especially useful on dedicated servers, where the
 administrator might want to determine what's limiting performance in a slow
 game.
 The frame rate is given as two figures, the simulation rate and the graphics
 frame rate. Usually these are identical, as the screen is rendered exactly
 once per simulated tick, but in the future there might be support for graphics
 and simulation running at different rates. When the game is paused, the
 simulation rate drops to zero.
 In addition to the simulation rate, a game speed factor is also calculated.
 This is based on the target simulation speed, which is 30 milliseconds per
 game tick. At that speed, the expected frame rate is 33.33 frames/second, and
 the game speed factor is how close to that target the actual rate is. When
 the game is in fast forward mode, the game speed factor shows how much
 speed up is achieved.
 The lower part of the window shows timing statistics for individual parts of
 the game. The times shown are short-term and long-term averages of how long
 it takes to process one tick of game time, all figures are in milliseconds.
 Clicking a line in the lower part of the window opens a graph window, giving
 detailed readings on each tick simulated by the game.
 The following is an explanation of the different statistics:
 - *Game loop* - Total processing time used per simulated "tick" in the game.
  This includes all pathfinding, world updates, and economy handling.
 - *Cargo handling* - Time spent loading/unloading cargo at stations, and
  industries and towns sending/retrieving cargo from stations.
 - *Train ticks*, *Road vehicle ticks*, *Ship ticks*, *Aircraft ticks* -
  Time spent on pathfinding and other processing for each player vehicle type.
 - *World ticks* - Time spent on other world/landscape processing. This
  includes towns growing, building animations, updates of farmland and trees,
  and station rating updates.
 - *GS/AI total*, *Game script*, and *AI players* - Time spent running logic
  for game scripts and AI players. The total may show as less than the current
  sum of the individual scripts, this is because AI players at lower
  difficulty settings do not run every game tick, and hence contribute less
  to the average across all ticks. Keep in mind that the "Current" figure is
  also an average, just only over short term.
 - *Link graph delay* - Time overruns of the cargo distribution link graph
  update thread. Usually the link graph is updated in a background thread,
  but these updates need to synchronise with the main game loop occasionally,
  if the time spent on link graph updates is longer than the time taken to
  otherwise simulate the game while it was updating, these delays are counted
  in this figure.
 - *Graphics rendering* - Total time spent rendering all graphics, including
  both GUI and world viewports. This typically spikes when panning the view
  around, and when more things are happening on screen at once.
 - *World viewport rendering* - Isolated time spent rendering just world
  viewports. If this figure is significantly lower than the total graphics
  rendering time, most time is spent rendering GUI than rendering world.
 - *Video output* - Speed of copying the rendered graphics to the display
  adapter. Usually this should be very fast (in the range of 0-3 ms), large
  values for this can indicate a graphics driver problem.
 - *Sound mixing* - Speed of mixing active audio samples together. Usually
  this should be very fast (in the range of 0-3 ms), if it is slow, consider
  switching to the NoSound set.
 If the frame rate window is shaded, the title bar will instead show just the
 current simulation rate and the game speed factor.
--- a/findversion.sh
+++ b/findversion.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2019-10-29
+Last updated:    2019-12-25
-Release version: 1.10.0-beta1
+Release version: 1.10.0-beta2
 ------------------------------------------------------------------------
--- a/media/baseset/no_music.obm
+++ b/media/baseset/no_music.obm
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents more or less nothingness
 ;
 [metadata]
--- a/media/baseset/no_sound.obs
+++ b/media/baseset/no_sound.obs
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents more or less nothingness
 ;
 [metadata]
--- a/media/baseset/orig_dos.obg
+++ b/media/baseset/orig_dos.obg
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the non-German Transport
 ; Tycoon Deluxe DOS CD.
 ;
--- a/media/baseset/orig_dos.obm
+++ b/media/baseset/orig_dos.obm
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for DOS CD.
 ;
--- a/media/baseset/orig_dos.obs
+++ b/media/baseset/orig_dos.obs
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original sounds as on the Transport
 ; Tycoon Deluxe DOS CD.
 ;
--- a/media/baseset/orig_dos_de.obg
+++ b/media/baseset/orig_dos_de.obg
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the German Transport
 ; Tycoon Deluxe DOS CD. It contains one broken sprite.
 ;
--- a/media/baseset/orig_tto.obm
+++ b/media/baseset/orig_tto.obm
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon (with World Editor) for DOS CD.
 ;
--- a/media/baseset/orig_win.obg
+++ b/media/baseset/orig_win.obg
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/orig_win.obm
+++ b/media/baseset/orig_win.obm
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/orig_win.obs
+++ b/media/baseset/orig_win.obs
@@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original sounds as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/translations.awk
+++ b/media/baseset/translations.awk
@@ -1,5 +1,3 @@
 # $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z rubidium $
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/2ccmap.nfo
+++ b/media/extra_grf/2ccmap.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airport_preview.nfo
+++ b/media/extra_grf/airport_preview.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airports.nfo
+++ b/media/extra_grf/airports.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airports_orig_extra.nfo
+++ b/media/extra_grf/airports_orig_extra.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/aqueduct.nfo
+++ b/media/extra_grf/aqueduct.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/assemble_nfo.awk
+++ b/media/extra_grf/assemble_nfo.awk
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/autorail.nfo
+++ b/media/extra_grf/autorail.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/canals_extra.nfo
+++ b/media/extra_grf/canals_extra.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/chars.nfo
+++ b/media/extra_grf/chars.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/chars_orig_extra.nfo
+++ b/media/extra_grf/chars_orig_extra.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/elrails.nfo
+++ b/media/extra_grf/elrails.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/flags.nfo
+++ b/media/extra_grf/flags.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/foundations.nfo
+++ b/media/extra_grf/foundations.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/mono.nfo
+++ b/media/extra_grf/mono.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/oneway.nfo
+++ b/media/extra_grf/oneway.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -2,8 +2,6 @@
 // (Info version 32)
 // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/orig_extra.nfo
+++ b/media/extra_grf/orig_extra.nfo
@@ -2,8 +2,6 @@
 // (Info version 32)
 // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/palette.nfo
+++ b/media/extra_grf/palette.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/arctic.nfo
+++ b/media/extra_grf/rivers/arctic.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/rapids.nfo
+++ b/media/extra_grf/rivers/rapids.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/temperate.nfo
+++ b/media/extra_grf/rivers/temperate.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/toyland.nfo
+++ b/media/extra_grf/rivers/toyland.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/tropic.nfo
+++ b/media/extra_grf/rivers/tropic.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/roadstops.nfo
+++ b/media/extra_grf/roadstops.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/signals.nfo
+++ b/media/extra_grf/signals.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/sloped_tracks.nfo
+++ b/media/extra_grf/sloped_tracks.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/tramtracks.nfo
+++ b/media/extra_grf/tramtracks.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/tunnel_portals.nfo
+++ b/media/extra_grf/tunnel_portals.nfo
@@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/openttd.desktop.filter.awk
+++ b/media/openttd.desktop.filter.awk
@@ -1,5 +1,3 @@
 # $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -1,4 +1,3 @@
 # $Id$
 # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html
 [Desktop Entry]
 Type=Application
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
 openttd (1.10.0~beta2-0) unstable; urgency=low
  * New upstream release 1.10.0-beta2
 -- OpenTTD <info@openttd.org>  Wed, 25 Dec 2019 00:00:00 +0000
 openttd (1.10.0~beta1-0) unstable; urgency=low
  * New upstream release 1.10.0-beta1
--- a/os/macosx/plistgen.sh
+++ b/os/macosx/plistgen.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # sets VERSION to the value if RELEASE if there are any,
 # otherwise it sets VERSION to revision number
 if [ "$3" ]; then
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
 #
 Name:           openttd
-Version:        1.10.beta1
+Version:        1.10.beta2
 Release:        0
-%define srcver  1.10.0-beta1
+%define srcver  1.10.0-beta2
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 10
 !define APPV_MAINT 0
-!define APPV_BUILD 0
+!define APPV_BUILD 1
-!define APPV_EXTRA "-beta1"
+!define APPV_EXTRA "-beta2"
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -1,7 +1,5 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/projects/gen-kdev4.sh
+++ b/projects/gen-kdev4.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charles Pigott	18f03a300b	Update: Prepare for 1.10.0-beta2 release	2019-12-24 22:20:28 +00:00
translators	d427559eba	Update: Translations from eints french: 1 change by arikover	2019-12-24 19:45:40 +01:00
SamuXarick	40605efd1c	Codechange: Use KDTree for AirportGetNearestTown (#7424 )	2019-12-24 17:37:30 +00:00
Michał Janiszewski	c7ead8388c	Codechange: Improve MSVC ARM64 support	2019-12-24 13:14:11 +00:00
Mingwei Samuel	26ce4eb45d	Fix #7430 : when train visits station, only reset time_since_pickup if has room to load	2019-12-23 21:07:45 +01:00
Samu	f0ff7003fd	Fix: Snowline height interval is now 1, in both World Generation and Settings windows - Previously, it was 1 in World Gen window, but 5 in Settings window	2019-12-23 21:05:39 +01:00
translators	dbe44e80f1	Update: Translations from eints	2019-12-23 19:45:40 +01:00
stormcone	fea5151ee1	Feature: Control + clicking on a vehicle in the vehicle list window opens the vehicle group window focused on the vehicle's group.	2019-12-23 18:04:10 +00:00
stormcone	798e9ee93e	Feature: Add a button to the vehicle advisory news window to open the group window.	2019-12-23 18:04:10 +00:00
stormcone	cc1d72c3a3	Feature: Control + click on the vehicle details button in the vehicle view window opens the vehicle group window, then selects and scrolls to the vehicle's group.	2019-12-23 18:04:10 +00:00
stormcone	a363933d08	Feature: Control + click on a vehicle in the vehicle group window selects and scrolls to the vehicle's group.	2019-12-23 18:04:10 +00:00
stormcone	551bde77a4	Add: A function which selects and scrolls to a particular group in the vehicle group window.	2019-12-23 18:04:10 +00:00
glx	42144ecd56	Add: a TextColour flag to ignore colour changes from strings	2019-12-23 17:30:13 +00:00
frosch	b769eb30c4	Fix: Setting the default railtype to 'first/last available' did not work with NewGRF defined railtypes.	2019-12-23 17:23:20 +00:00
frosch	6fa217dfc8	Codechange: Use RAILTYPE_BEGIN instead of RAILTYPE_RAIL when the intention is iteration.	2019-12-23 17:23:20 +00:00
frosch	3d29c9483b	Codechange: Use a switch with fall-through instead of a if-sequence with context data between cases.	2019-12-23 17:23:20 +00:00
frosch	7f351fd7c1	Fix: Action7/9 conditions 0F..12 reported roadtypes as valid tramtypes and vice versa.	2019-12-23 17:23:20 +00:00
frosch	bc7f92815b	Cleanup: Remove unused constants. The value of the tram constant was also incorrect.	2019-12-23 17:23:20 +00:00
frosch	e5dd19b0de	Cleanup: Properties 12 and 15 do not exist for road/tramtypes.	2019-12-23 17:23:20 +00:00
translators	b0d443d525	Update: Translations from eints korean: 1 change by telk5093	2019-12-22 19:45:40 +01:00
glx	faaec445d6	Fix: [MinGW] undefined references when _FORTIFY_SOURCE > 0	2019-12-21 20:13:28 +01:00
glx	e3c75a30ba	Fix: unused variable warnings	2019-12-21 20:13:03 +01:00
glx	ae532008ff	Cleanup: remove FOR_ALL_ITEMS	2019-12-21 20:13:03 +01:00
glx	ee7a8eebca	Codechange: Replace FOR_ALL_TOWNS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	0b489f9924	Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops	2019-12-21 20:13:03 +01:00
glx	847e5f33d4	Codechange: Replace story related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	869581eb23	Codechange: Replace FOR_ALL_SIGNS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	b91abd3af9	Codechange: Replace FOR_ALL_ROADSTOPS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	514565fad6	Codechange: Replace FOR_ALL_OBJECTS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	11f178a312	Codechange: Replace FOR_ALL_STORAGES with range-based for loops	2019-12-21 20:13:03 +01:00
glx	d8a1be48cd	Codechange: Replace vehicle related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	9892d90b26	Codechange: Replace order related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	41232f18c1	Codechange: Replace network related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	09fa39c5b5	Codechange: Replace linkgraph related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	00c2a98cf3	Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops	2019-12-21 20:13:03 +01:00
glx	4ae829cb27	Codechange: Replace FOR_ALL_GROUPS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	f58ce3db19	Codechange: Replace FOR_ALL_GOALS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	1f6b3a37f9	Codechange: Replace FOR_ALL_ENGINES with range-based for loops	2019-12-21 20:13:03 +01:00
glx	1c92ba8ebe	Codechange: Replace FOR_ALL_CARGO_PAYMENTS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	fa9769f81a	Codechange: Replace FOR_ALL_DEPOTS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	5fce5fa300	Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	60e3cf8aff	Codechange: Replace FOR_ALL_ENGINE_RENEWS with range-based for loops	2019-12-21 20:13:03 +01:00
glx	ddabfed1cd	Codechange: Replace station related FOR_ALL with range-based for loops	2019-12-21 20:13:03 +01:00
glx	3a14cea068	Codechange: Replace FOR_ALL_COMPANIES with range-based for loops	2019-12-21 20:13:03 +01:00
glx	68f22134cb	Add: Allow iteration of pools in range-based for loops	2019-12-21 20:13:03 +01:00
translators	379402f02e	Update: Translations from eints croatian: 9 changes by VoyagerOne	2019-12-21 19:45:41 +01:00
Samu	96f8c13543	Fix: Custom sea level default value is now equal to minimum value, not lower Custom sea level default value was lower than the minimum	2019-12-21 18:12:01 +00:00
translators	e54184d18b	Update: Translations from eints portuguese: 16 changes by mcbanhas	2019-12-18 19:45:40 +01:00
glx	e001d87569	Add #7801 : [Script] more error mappings	2019-12-17 21:35:07 +00:00
translators	94cc0edb70	Update: Translations from eints portuguese: 225 changes by mcbanhas	2019-12-17 19:45:38 +01:00
translators	df2a19ec87	Update: Translations from eints german: 9 changes by planetmaker portuguese: 19 changes by mcbanhas	2019-12-16 19:45:41 +01:00
translators	f7bf8e2da9	Update: Translations from eints german: 11 changes by mini1025	2019-12-10 19:45:40 +01:00
Jonathan G Rennison	35dc377a58	Fix: Infrastructure total update when removing tram road stop The wrong road owner was used when updating the tram infrastructure total. This could result in desyncs, negative infrastructure totals, etc.	2019-12-08 15:12:56 +01:00
translators	03bbae7fe9	Update: Translations from eints ukrainian: 56 changes by nsergiy	2019-12-07 19:45:40 +01:00
Niels Martin Hansen	9900af38f5	Fix #7847 : Use ViewportSign coordinates for sign Kdtree coordinates (#7849 ) Ensure the same coordinates are used for station/town/player signs regardless of how the landscape changes below it after the coordinates were first determined. By keeping track of whether each ViewportSign is valid for Kdtree use (and only ever registering the viewport sign when the object is valid) a lot of code can be simplified and become more robust at the same time.	2019-12-01 23:17:33 +01:00
translators	f91c701ffe	Update: Translations from eints hungarian: 1 change by Brumi	2019-12-01 19:45:40 +01:00
stormcone	40ebf3c765	Fix: Do not refer to a function in the documentation that was removed years ago (#7844 ) The 'DoDrawString' was removed with this commit: `f11300d`	2019-11-25 22:59:03 +01:00
glx22	d865916a07	Fix #7836 : Check coherency of NewGRF parameter min/max (#7840 )	2019-11-23 13:21:01 +00:00
translators	ef8455f549	Update: Translations from eints vietnamese: 73 changes by myquartz	2019-11-20 19:45:39 +01:00
frosch	61dba850af	Revert #7837 , `7e22f243e`: OpenTTD tries to replicate the original game mechanics. Making numbers look nice and correlate is no goal, and in this case they actually did not correlate.	2019-11-20 08:01:37 +00:00
translators	c7b703d426	Update: Translations from eints vietnamese: 36 changes by myquartz	2019-11-19 19:45:38 +01:00
Yourself	7e22f243ed	Fix: typo in town growth rates (#7837 )	2019-11-18 16:20:47 +01:00
translators	d242b1824c	Update: Translations from eints vietnamese: 19 changes by myquartz russian: 5 changes by Lone_Wolf korean: 5 changes by telk5093, 1 change by kevinhigh	2019-11-17 19:45:40 +01:00
translators	70f8c729d4	Update: Translations from eints french: 7 changes by glx	2019-11-16 19:45:39 +01:00
glx22	e3dc65978d	Fix `e3511ecac`: Don't use bash specific syntax (again) (#7835 )	2019-11-16 14:23:25 +00:00
Charles Pigott	60cbddbb5f	Fix #7606 : Game crash when trying to clean up a crashed script Also fix another possible memory leak	2019-11-15 21:06:09 +01:00
Charles Pigott	cf354f6668	Codechange: new instead of malloc	2019-11-15 21:06:09 +01:00
glx22	ddffe32f15	Fix #7646 : Incomplete cleanup for non-threaded world generation failure (#7805 )	2019-11-14 20:13:15 +00:00
glx22	0bdbd509be	Fix #7673 : [Script] Allow removal of custom town text (#7834 )	2019-11-14 20:10:03 +00:00
translators	b533c66f42	Update: Translations from eints finnish: 5 changes by hpiirai galician: 183 changes by Michi polish: 5 changes by azabost dutch: 6 changes by JanWillem spanish (mexican): 5 changes by Absay	2019-11-14 19:45:40 +01:00
Jonathan G Rennison	a1d6354caf	Fix: Out of bounds tile access in ErrmsgWindow::OnInitialPosition This fixes part A of #7619, but not part B. Vehicle::x_pos and Vehicle::y_pos are not required to be within the map bounds. See also: GetTileHeightBelowAircraft()	2019-11-14 08:13:44 +01:00
glx	da2504a0de	Fix `e3511ecac`: don't use bash specific syntax	2019-11-13 22:11:45 +01:00
Andy	cfc4568ddc	Doc: revised README to be more helpful to casual GitHub visitors	2019-11-13 20:40:18 +01:00
translators	b8abd54181	Update: Translations from eints czech: 5 changes by djst	2019-11-13 19:45:40 +01:00
glx	196247ae71	Codechange: [AzurePipeline] move docs and source to developer files section	2019-11-13 18:53:38 +01:00
glx	e3511ecacd	Codechange: [AzurePipeline] add developer files section in manifest	2019-11-13 18:53:38 +01:00
glx	9fc6329066	Cleanup: Remove unused strings	2019-11-13 08:11:37 +00:00
glx	fa657c8360	Fix #7631 : 16 out cargo support for industry directory	2019-11-13 08:11:37 +00:00
translators	4eab70f84e	Update: Translations from eints polish: 115 changes by azabost vietnamese: 5 changes by nglekhoi	2019-11-10 19:45:40 +01:00
S. D. Cloudt	13cc8a0cee	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
Jonathan G Rennison	a15ace0f5b	Fix #7783 , Fix #7816 : [SDL2] Fix input handling in edit context In particular this fixes handling of the shift key	2019-11-10 17:58:42 +00:00
Jonathan G Rennison	1dba06656d	Codechange: Add utility function for whether the focused window is a console	2019-11-10 17:58:42 +00:00
Jonathan G Rennison	81f159434d	Codechange: Add EditBoxGainedFocus method to VideoDriver base class	2019-11-10 17:58:42 +00:00
Jonathan G Rennison	46f7c6a641	Change: [SDL2] Add an "unprintable" flag to struct VkMapping SDL_Keysym::sym is not suitable for checking whether the character is printable or not	2019-11-10 17:58:42 +00:00
Jonathan G Rennison	d41378c00a	Fix: [SDL2] Page down key not handled SDLK_PAGEUP and SDLK_PAGEDOWN are not sequential They must have separate entries in _vk_mapping	2019-11-10 17:58:42 +00:00
Jonathan G Rennison	3db399d7d9	Fix: [SDL2] Detection of backtick scancode SDL_Keysym::scancode is a SDL_SCANCODE_* constant, not a raw scan code	2019-11-10 17:58:42 +00:00
Samu	3d362f2513	Fix #7697 : Add a Missing AddProducedCargo proc for HQ On TileLoop_Object, HQs are able to produce and move passengers and mail to stations, but querying the HQ tiles for cargo supplied was returning nothing. This makes it so that they return +1 to both passengers and mail.	2019-11-10 17:58:02 +00:00
Jonathan G Rennison	2be619ea88	Fix #7820 : Heap use after free when removing oil rig	2019-11-03 00:39:38 +01:00
translators	460f73cd2d	Update: Translations from eints tamil: 22 changes by aswn	2019-11-02 19:45:41 +01:00
Charles Pigott	6929429f0f	Fix `ccb4c37`: Use of possibly uninitialised pointer (#7818 )	2019-11-02 13:24:38 +00:00
Charles Pigott	729caa135b	Fix: Remove duplicate entry from changelog	2019-11-02 11:31:59 +00:00
Charles Pigott	3775381c10	Fix: [Pipelines] Account for versions being more than one digit when generating changelog output	2019-11-02 11:31:59 +00:00
SamuXarick	ccb4c3797f	Fix #5405 : Aircraft could route to depots outside their range (#7104 )	2019-11-02 11:26:04 +00:00
Nikolas Nyby	4884dcacba	Fix #7784 : up/down/home/end key behavior in SDL2 Closes #7784.	2019-11-01 23:41:47 +01:00
Michael Lutz	d5a9bd404a	Codechange: [OSX] Use std::unique_ptr with a custom deleter to simply memory management of Core Foundation types.	2019-11-01 22:32:53 +01:00
translators	58122983fb	Update: Translations from eints korean: 6 changes by telk5093	2019-10-30 19:45:40 +01:00
`@@ -1,4 +1,2 @@`
	`/* $Id$ */`

	`print(" Required this file");`	`print(" Required this file");`