Jonathan G Rennison fa304cdb75 Merge branch 'master' into save_ext ...

# Conflicts:
#	src/saveload/saveload.cpp

2018-05-25 19:09:20 +01: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

…

build_industry.h

(svn r27137) -Fix (r0): Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion.

2015-02-06 21:54:19 +00:00

cargo_const.h

…

clear_land.h

…

company_settings.ini

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

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

control_codes.h

Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737)

2018-04-19 19:33:21 +01:00

currency_settings.ini

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

2017-08-20 10:37:45 +01: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

(svn r26930) -Add: extra shadings to he heightmap colour tables (Chillcore)

2014-09-27 14:51:34 +00:00

industry_land.h

…

landscape_sprite.h

…

misc_settings.ini

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

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

newgrf_debug_data.h

(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)

2016-09-05 19:11:01 +00:00

object_land.h

(svn r27183) -Fix: GCC5 compilation

2015-03-13 19:42:49 +00:00

palette_convert.h

…

palettes.h

(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)

2015-07-26 09:47:17 +00:00

pricebase.h

…

railtypes.h

…

road_land.h

…

roadveh_movement.h

…

settings.h.postamble

…

settings.h.preamble

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

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

settings.ini

Merge branch 'master' into save_ext

2018-05-25 19:09:20 +01:00

sprites.h

(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)

2014-10-15 18:31:37 +00:00

station_land.h

…

strgen_tables.h

Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737)

2018-04-19 19:33:21 +01:00

string_colours.h

(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.

2015-08-10 10:04:14 +00:00

town_land.h

…

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

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

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

window_settings.ini

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

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