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/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2020-02-09 15:43:47 +00:00
parent a152e2327c e340934d04
commit babe98cdb1
43 changed files with 240 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,10 +13,12 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.10.0
* \b 1.11.0
*
* This version is not yet released. The following changes are not set in stone yet.
*
* \b 1.10.0
*
* API additions:
* \li AIGroup::SetPrimaryColour
* \li AIGroup::SetSecondaryColour

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

@@ -13,10 +13,12 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.10.0
* \b 1.11.0
*
* This version is not yet released. The following changes are not set in stone yet.
*
* \b 1.10.0
*
* API additions:
* \li GSVehicle::BuildVehicleWithRefit
* \li GSVehicle::GetBuildWithRefitCapacity