Jonathan G Rennison 1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp ...

# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h

2017-01-30 21:41:20 +00: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

2016-05-08 01:13:35 +01:00

control_codes.h

Merge branch 'enhanced_viewport_overlay' into jgrpp

2016-12-26 15:38:56 +00:00

currency_settings.ini

Initialiser list fixes for legacy compilers.

2015-08-16 14:36:07 +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 r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.

2016-11-05 11:53:03 +00:00

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 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

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

Add generic mechanism to cross-ref settings at load time.

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

settings.ini

Merge branch 'signal_tunnels_bridges' into jgrpp

2017-01-30 21:41:20 +00:00

sprites.h

Merge branch 'tracerestrict-sx' into jgrpp

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

station_land.h

…

strgen_tables.h

Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1.

2016-11-25 23:12:23 +00: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

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

(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