dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2017-03-12 20:37:26 +00:00
parent c1a26459d8 980871a87b
commit ac69b746ab
87 changed files with 356 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/script/api/ai_changelog.hpp
View File

@@ -15,23 +15,19 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.8.0
*
* 1.8.0 is not yet released. The following changes are not set in stone yet.
*
* \b 1.7.0
*
* 1.7.0 is not yet released. The following changes are not set in stone yet.
* No changes
*
* \b 1.6.0
* \b 1.6.1 - 1.6.0
*
* No changes
*
* \b 1.5.3
*
* No changes
*
* \b 1.5.2
*
* No changes
*
* \b 1.5.1
* \b 1.5.3 - 1.5.1
*
* No changes
*
@@ -53,20 +49,7 @@
* \li AIStationList_CargoWaitingFromByVia
* \li AIStationList_CargoWaitingViaByFrom
*
* \b 1.4.4
*
* No changes
*
* \b 1.4.3
*
* No changes
*
* \b 1.4.2
*
* No changes
*
* \b 1.4.1
*
* \b 1.4.4 - 1.4.1
* No changes
*
* \b 1.4.0
@@ -87,11 +70,7 @@
* \li AIStation::GetCargoRating does return -1 for cargo-station combinations that
* do not have a rating yet instead of returning 69.
*
* \b 1.3.3
*
* No changes
*
* \b 1.3.2
* \b 1.3.3 - 1.3.2
*
* No changes
*
@@ -110,15 +89,7 @@
* \li AIStation::OpenCloseAirport
* \li AIController::Break
*
* \b 1.2.3
*
* No changes
*
* \b 1.2.2
*
* No changes
*
* \b 1.2.1
* \b 1.2.3 - 1.2.1
*
* No changes
*
@@ -185,15 +156,7 @@
* API additions:
* \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached.
*
* \b 1.1.3
*
* No changes
*
* \b 1.1.2
*
* No changes
*
* \b 1.1.1
* \b 1.1.3 - 1.1.1
*
* No changes
*
@@ -224,11 +187,7 @@
* \li AIRoad::BuildDriveThroughRoadStation now allows overbuilding.
* \li AIRoad::BuildRoadStation now allows overbuilding.
*
* \b 1.0.5
*
* No changes
*
* \b 1.0.4
* \b 1.0.5 - 1.0.4
*
* No changes
*
@@ -342,11 +301,7 @@
* station orders for buoys one has to use waypoint orders.
* \li Autoreplaces can now also be set for the default group via AIGroup.
*
* \b 0.7.5
*
* No changes
*
* \b 0.7.4
* \b 0.7.5 - 0.7.4
*
* No changes
*

40
src/script/api/game_changelog.hpp
View File

@@ -15,23 +15,19 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.8.0
*
* 1.8.0 is not yet released. The following changes are not set in stone yet.
*
* \b 1.7.0
*
* 1.7.0 is not yet released. The following changes are not set in stone yet.
* No changes
*
* \b 1.6.0
* \b 1.6.1 - 1.6.0
*
* No changes
*
* \b 1.5.3
*
* No changes
*
* \b 1.5.2
*
* No changes
*
* \b 1.5.1
* \b 1.5.3 - 1.5.1
*
* No changes
*
@@ -58,11 +54,7 @@
* industry, or town. The user can click at the news message to jump to the
* referred location.
*
* \b 1.4.4
*
* No changes
*
* \b 1.4.3
* \b 1.4.4 - 1.4.3
*
* No changes
*
@@ -106,11 +98,7 @@
* \li GSStation::GetCargoRating does return -1 for cargo-station combinations that
* do not have a rating yet instead of returning 69.
*
* \b 1.3.3
*
* No changes
*
* \b 1.3.2
* \b 1.3.3 - 1.3.2
*
* No changes
*
@@ -136,15 +124,7 @@
* Other changes:
* \li Company specific goals are now removed when a company goes bankrupt or is taken over.
*
* \b 1.2.3
*
* No changes
*
* \b 1.2.2
*
* No changes
*
* \b 1.2.1
* \b 1.2.3 - 1.2.1
*
* No changes
*