summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2014-04-27 15:45:53 +0000
committerfrosch <frosch@openttd.org>2014-04-27 15:45:53 +0000
commit083e02afe119a3119c052a97f27aecda2e45bb87 (patch)
tree102b87f43d2e9c569b547bb9f3699925c7deb74f
parent0ba81bff1773ed66cbd00ef976e4834abf132f41 (diff)
downloadopenttd-083e02afe119a3119c052a97f27aecda2e45bb87.tar.xz
(svn r26529) -Merge: documentation updates from 1.4 branch
-rw-r--r--changelog.txt16
-rw-r--r--os/debian/changelog12
-rw-r--r--src/script/api/ai_changelog.hpp2
-rw-r--r--src/script/api/game_changelog.hpp2
4 files changed, 28 insertions, 4 deletions
diff --git a/changelog.txt b/changelog.txt
index c7576aed6..1da7d4d1b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,19 @@
+1.4.0 (2014-04-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.4.0-RC1 (2014-03-18)
+------------------------------------------------------------------------
+- Feature: [Script] APIs to get cargo waiting from/via other station (r26396)
+- Fix: Do not explain "symmetric" cargodist mode when the setting does not allow it [FS#5939] (r26394)
+- Fix: Update distances between link graph nodes when station sign is moved (r26393)
+- Fix: No need to call OnFocus twice [FS#5933] (r26392)
+- Fix: Select a specific font size when freetype fails to select one automatically [FS#5885] (r26389)
+- Fix: Return correct values from ICU iterators in case of leading or trailing whitespace [FS#5924] (r26384)
+- Fix: All goal commands invalidated the goal list of company 0 [FS#5932] (r26382)
+
+
1.4.0-beta5 (2014-02-25)
------------------------------------------------------------------------
- Feature: Warn the user about empty setting search results, and about missing setting search results due to filtering (r26322, r26321)
diff --git a/os/debian/changelog b/os/debian/changelog
index ff655a1b4..1ff0deed6 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,15 @@
+openttd (1.4.0-0) unstable; urgency=low
+
+ * New upstream release 1.4.0
+
+ -- OpenTTD <info@openttd.org> Tue, 01 Apr 2014 21:00:00 +0200
+
+openttd (1.4.0~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-RC1
+
+ -- OpenTTD <info@openttd.org> Tue, 17 Mar 2014 21:00:00 +0100
+
openttd (1.4.0~beta5-0) unstable; urgency=low
* New upstream release 1.4.0-beta5
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index 7df7027ab..f54495080 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -21,8 +21,6 @@
*
* \b 1.4.0
*
- * 1.4.0 is not yet released. The following changes are not set in stone yet.
- *
* API additions:
* \li AICargo::GetDistributionType
* \li AIDate::DATE_INVALID
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 6da64c23b..632296cd9 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -21,8 +21,6 @@
*
* \b 1.4.0
*
- * 1.4.0 is not yet released. The following changes are not set in stone yet.
- *
* API additions:
* \li AICargo::GetDistributionType
* \li GSCompany::ChangeBankBalance