Jonathan G Rennison a4ad4130a6 Merge branch 'master' into infrastructure_sharing ...

Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp

2015-08-06 22:55:09 +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

…

control_codes.h

(svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo.

2014-01-12 18:01:33 +00:00

currency_settings.ini

…

elrail_data.h

…

engines.h

(svn r25115) -Fix (r8973) [FS#5492-ish]: [NewGRF] Acceleration of NewGRF aircraft was too fast, while acceleration of default aircraft was way too slow. I.e. choose wisely who to let write the software for your orbiter.

2013-03-22 21:27:13 +00:00

gameopt_settings.ini

(svn r26206) -Fix [FS#5829]: Run everything from ini, obg, obs, obs, ... files through str_validate.

2014-01-02 17:55:57 +00: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

(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.

2014-10-11 13:22:37 +00:00

newgrf_debug_data.h

(svn r27048) -Fix (r26158): Position in articulated vehicle is 4D, not 4A.

2014-10-28 00:51:51 +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

…

settings.ini

Merge branch 'master' into infrastructure_sharing

2015-08-06 22:55:09 +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

(svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes.

2015-05-28 17:26:53 +00:00

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

town_land.h

(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w

2013-06-01 07:44:53 +00:00

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

…

unicode.h

…

water_land.h

…

win32_settings.ini

(svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.

2014-04-27 12:15:14 +00:00

window_settings.ini

(svn r25295) -Feature: Allow saving window sizes as default sizes.

2013-05-26 19:30:31 +00:00