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

..

airport_defaults.h

(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant

2017-08-31 06:55:38 +00:00

airport_movement.h

…

airporttile_ids.h

…

airporttiles.h

…

animcursors.h

…

autorail.h

…

bridge_land.h

Raise the maximum number of bridge types to 16

2018-08-07 22:42:36 +01:00

build_industry.h

Add: Industries can produce and accept up to 16 different cargoes

2018-11-03 21:43:54 +01:00

cargo_const.h

…

clear_land.h

…

company_settings.ini

Merge branch 'save_ext' into jgrpp

2017-08-20 10:38:23 +01:00

control_codes.h

Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00

currency_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00

darklight_colours.h

Fix dark/lighten colour mappings going to/from yellow flash cycle.

2015-11-12 20:14:08 +00:00

elrail_data.h

(svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots.

2018-03-05 21:24:48 +00:00

engines.h

…

gameopt_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00

genland.h

…

heightmap_colours.h

…

industry_land.h

…

landscape_sprite.h

…

misc_settings.ini

Merge branch 'save_ext' into jgrpp

2017-08-20 10:38:23 +01:00

newgrf_debug_data.h

Merge branch 'master' into jgrpp

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

object_land.h

…

palette_convert.h

…

palettes.h

…

pricebase.h

Revert back to v2 of house picking/placing patch.

2016-05-12 22:35:39 +01:00

railtypes.h

…

road_land.h

…

roadveh_movement.h

…

settings.h.postamble

…

settings.h.preamble

Merge branch 'master' into save_ext

2018-07-02 18:41:39 +01:00

settings.ini

Add setting to enable flipping direction of all train types in depot

2018-09-11 06:08:02 +01:00

sprites.h

Merge branch 'tracerestrict-sx' into jgrpp

2015-12-09 01:03:37 +00:00

station_land.h

…

strgen_tables.h

Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00

string_colours.h

…

town_land.h

Revert back to v2 of house picking/placing patch.

2016-05-12 22:35:39 +01:00

townname.h

Silence -Wunused-variable warnings in src/table/townname.h

2016-09-05 23:16:47 +01:00

track_land.h

…

train_cmd.h

…

tree_land.h

…

unicode.h

…

water_land.h

…

win32_settings.ini

Fix default for orderproc not being set in table/win32_settings.ini

2018-06-07 06:41:46 +01:00

window_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00