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

..

ai_accounting.hpp.sq

…

ai_airport.hpp.sq

Add: AI/GS GetMonthlyMaintenanceCost (#6897)

2018-11-01 18:06:08 +01:00

ai_base.hpp.sq

…

ai_basestation.hpp.sq

…

ai_bridge.hpp.sq

…

ai_bridgelist.hpp.sq

…

ai_cargo.hpp.sq

(svn r26396) -Add: [script] AI/GS APIs to get cargo waiting from/via other station

2014-03-10 22:18:53 +00:00

ai_cargolist.hpp.sq

…

ai_company.hpp.sq

Feature #6459: API for querying network clients from GS (#6736)

2018-04-22 15:42:29 +02:00

ai_controller.hpp.sq

…

ai_date.hpp.sq

…

ai_depotlist.hpp.sq

…

ai_engine.hpp.sq

…

ai_enginelist.hpp.sq

…

ai_error.hpp.sq

…

ai_event_types.hpp.sq

…

ai_event.hpp.sq

…

ai_execmode.hpp.sq

…

ai_gamesettings.hpp.sq

…

ai_group.hpp.sq

…

ai_grouplist.hpp.sq

…

ai_industry.hpp.sq

…

ai_industrylist.hpp.sq

…

ai_industrytype.hpp.sq

…

ai_industrytypelist.hpp.sq

…

ai_infrastructure.hpp.sq

…

ai_list.hpp.sq

(svn r26894) -Feature: Swap method for script lists

2014-09-21 16:25:15 +00:00

ai_log.hpp.sq

…

ai_map.hpp.sq

…

ai_marine.hpp.sq

…

ai_order.hpp.sq

…

ai_rail.hpp.sq

…

ai_railtypelist.hpp.sq

…

ai_road.hpp.sq

…

ai_sign.hpp.sq

…

ai_signlist.hpp.sq

…

ai_station.hpp.sq

Merge branch 'master' into jgrpp

2018-11-05 12:53:36 +00:00

ai_stationlist.hpp.sq

(svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via

2014-09-21 16:20:48 +00:00

ai_subsidy.hpp.sq

…

ai_subsidylist.hpp.sq

…

ai_testmode.hpp.sq

…

ai_tile.hpp.sq

…

ai_tilelist.hpp.sq

…

ai_town.hpp.sq

…

ai_townlist.hpp.sq

…

ai_tunnel.hpp.sq

…

ai_vehicle.hpp.sq

…

ai_vehiclelist.hpp.sq

…

ai_waypoint.hpp.sq

…

ai_waypointlist.hpp.sq

…