Jonathan G Rennison e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp ...

Conflicts:
	src/saveload/extended_ver_sl.cpp

2015-09-03 23:30:13 +01:00

..

airport_defaults.h

…

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

Merge branch 'auto_timetables-sx' into jgrpp

2015-09-03 23:30:13 +01:00

control_codes.h

Import departure boards patch

2015-08-01 19:48:19 +01:00

currency_settings.ini

Initialiser list fixes for legacy compilers.

2015-08-16 14:36:07 +01:00

darklight_colours.h

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

elrail_data.h

…

engines.h

…

gameopt_settings.ini

Initialiser list fixes for legacy compilers.

2015-08-16 14:36:07 +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

Merge branch 'save_ext' into jgrpp

2015-08-16 14:36:26 +01:00

newgrf_debug_data.h

(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.

2015-08-10 20:24:13 +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 generic mechanism to cross-ref settings at load time.

2015-08-17 20:11:30 +01:00

settings.ini

Merge branch 'save_ext_spp' into jgrpp

2015-08-31 10:22:39 +01:00

sprites.h

Merge branch 'tracerestrict-sx' into jgrpp

2015-08-20 00:39:26 +01:00

station_land.h

…

strgen_tables.h

Merge branch 'master' into depature-boards

2015-08-01 20:39:16 +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

(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param

2014-10-12 18:26:54 +00:00

track_land.h

…

train_cmd.h

(svn r26130) -Codechange: add some guards against using invalid image indices

2013-11-26 16:08:58 +00:00

tree_land.h

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

unicode.h

…

water_land.h

…

win32_settings.ini

Initialiser list fixes for legacy compilers.

2015-08-16 14:36:07 +01:00

window_settings.ini

Initialiser list fixes for legacy compilers.

2015-08-16 14:36:07 +01:00