Commit Graph

17 Commits

Author SHA1 Message Date
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station.
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
2017-09-20 19:11:48 +01:00
fonsinchen
b6833fc6ef (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
fonsinchen
73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
fonsinchen
7836470f60 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 2014-05-04 13:57:48 +00:00
fonsinchen
bb269661d4 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 2014-05-04 13:57:48 +00:00
zuu
ad639258f8 (svn r26396) -Add: [script] AI/GS APIs to get cargo waiting from/via other station 2014-03-10 22:18:53 +00:00
zuu
ae23f519f7 (svn r26396) -Add: [script] AI/GS APIs to get cargo waiting from/via other station 2014-03-10 22:18:53 +00:00
rubidium
25aed3423c (svn r25150) -Fix [FS#5514]: [Script] The was no way to differentiate between a cargo-station combination with or without rating, so introduce [AI|GS]Station::HasRating and let GetRating return -1 when there is no rating 2013-04-06 12:36:33 +00:00
rubidium
7a3d549f2f (svn r25150) -Fix [FS#5514]: [Script] The was no way to differentiate between a cargo-station combination with or without rating, so introduce [AI|GS]Station::HasRating and let GetRating return -1 when there is no rating 2013-04-06 12:36:33 +00:00
michi_cc
90fa700cc7 (svn r24127) -Feature [FS#1497]: Allow closing airports for incoming aircraft. (Based on patch by cirdan) 2012-04-17 19:43:18 +00:00
michi_cc
aa47d6c7f2 (svn r24127) -Feature [FS#1497]: Allow closing airports for incoming aircraft. (Based on patch by cirdan) 2012-04-17 19:43:18 +00:00
yexo
15dc9acb01 (svn r23453) -Add: [NoAI] AIStation.GetStationCoverageRadius(StationID) 2011-12-08 23:28:43 +00:00
yexo
b5d707b7a0 (svn r23453) -Add: [NoAI] AIStation.GetStationCoverageRadius(StationID) 2011-12-08 23:28:43 +00:00
truebrain
bef1451f18 (svn r23373) -Add: move the AI API to script/api/ai, and move the Squirrel C++ glue templates to script/api/template 2011-11-29 23:29:20 +00:00
truebrain
7158aaea31 (svn r23373) -Add: move the AI API to script/api/ai, and move the Squirrel C++ glue templates to script/api/template 2011-11-29 23:29:20 +00:00