pelya 0d868d80bd Merge branch 'master' into 1.5 ...

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h

2015-03-29 21:48:14 +03:00

..

airport_defaults.h

(svn r23415) -Feature: Infrastructure maintenance costs.

2011-12-03 23:40:46 +00:00

airport_movement.h

(svn r22741) -Add: Add exit direction of hangars to airport specifications.

2011-08-13 12:43:05 +00:00

airporttile_ids.h

(svn r19099) -Doc: two files had the wrong name in the @file comment

2010-02-11 20:52:56 +00:00

airporttiles.h

(svn r20623) -Codechange: unify the storing of animation related information

2010-08-26 15:31:40 +00:00

animcursors.h

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

2013-01-08 22:46:42 +00:00

autorail.h

…

bridge_land.h

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

2013-01-08 22:46:42 +00:00

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

(svn r23862) -Fix (r23860): Fix sweets capacity.

2012-01-28 14:12:42 +00:00

clear_land.h

(svn r23188) -Fix (r23168): fences on steep slopes were broken

2011-11-11 18:01:41 +00:00

company_settings.ini

(svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138)

2013-02-14 17:08:56 +00:00

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

(svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow)

2012-11-08 10:04:00 +00:00

elrail_data.h

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

2013-01-08 22:46:42 +00:00

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

Cloudsave support

2015-03-29 20:19:53 +03: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

(svn r20286) -Codechange: Unify end of doxygen comments.

2010-08-01 19:44:49 +00:00

landscape_sprite.h

(svn r24877) -Fix: some whitespace "errors"

2013-01-01 10:52:32 +00:00

misc_settings.ini

Merge branch 'master' into 1.5

2015-03-29 21:48:14 +03: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

(svn r23433) -Fix [FS#4868]: recolouring of some animated colours from the windows palette went wrong

2011-12-04 19:07:24 +00:00

palettes.h

(svn r24111) -Codechange: use Colour more instead of manually bitstuffing

2012-04-10 20:16:51 +00:00

pricebase.h

(svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type.

2012-02-11 22:43:39 +00:00

railtypes.h

(svn r24368) -Fix (r24367): Silence GCC warnings.

2012-07-02 15:55:13 +00:00

road_land.h

(svn r19056) -Add: [NewGRF] Action 3/2/1 (i.e. new graphics) support for rail types. (To be documented...)

2010-02-07 22:22:54 +00:00

roadveh_movement.h

(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once

2010-11-20 09:09:57 +00:00

settings.h.postamble

(svn r22199) -Cleanup-ish: replace the shortcut macros for (gui)flags with their more clearly named (longer) constant names

2011-03-05 11:34:31 +00:00

settings.h.preamble

(svn r24991) -Doc: Clarify comments regarding settings macros.

2013-02-14 11:06:01 +00:00

settings.ini

Merge branch 'master' into 1.5

2015-03-29 21:48:14 +03:00

sprites.h

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

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

station_land.h

(svn r23010) -Add [FS#4797]: Support company colour for the airports' jetways (zeroeight)

2011-10-07 07:56:30 +00:00

strgen_tables.h

(svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen

2013-11-22 21:43:47 +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

(svn r23582) -Fix [FS#4870]: add missing characters for certain languages and the large font

2011-12-17 21:42:11 +00:00

water_land.h

(svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc)

2011-07-10 13:04:04 +00:00

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