Commit Graph

150 Commits (248ac0e263c632a1ccfb3cfb42ec760c2fbd4407)

Author SHA1 Message Date
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
9 years ago
patch-import ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
frosch 3d37abf802 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 9 years ago
rubidium d17a4e0918 (svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height 10 years ago
rubidium ab3660278a (svn r26880) -Add: stub settings for limiting bridge and map height 10 years ago
planetmaker 035fedd30b (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 10 years ago
rubidium 1cf6dad8f2 (svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
11 years ago
fonsinchen 7b2f8a885e (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 11 years ago
fonsinchen 848ca543a2 (svn r25351) -Add: settings for link graph 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch 336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 888df85a3a (svn r24845) -Add: News ticker sound setting to adv. settings window. 12 years ago
frosch 11bb1086bd (svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow) 12 years ago
frosch a90bc800e8 (svn r24792) -Add: Readd difficulty settings to advanced settings unless they are already present in other settings windows. 12 years ago
frosch 76fef0843c (svn r24790) -Remove: Classic difficulty profiles. 12 years ago
frosch 9ef1c5f4c3 (svn r24789) -Add: Separate setting to control the default settings of newly added scripts and random AIs. 12 years ago
frosch 903294f2bb (svn r24786) -Codechange: Add SettingsProfile enum for difficulty profiles and highscore tables. 12 years ago
frosch 18b97fa062 (svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow) 12 years ago
frosch 7bba04866d (svn r24672) -Add [FS#5356]: Remember the basic/advanced/expert filter selection. 12 years ago
frosch ac99094c91 (svn r24590) -Feature: More options for the auto-scroll setting. (adf88) 12 years ago
frosch 70b2c96c8b (svn r24194) -Change: Rename the 'signal_side' setting to 'train_signal_side', and add a third option while doing so. 12 years ago
michi_cc 07f32df363 (svn r24134) -Add: Configurable limits for tree planting. 12 years ago
michi_cc 88cfe6fc9c (svn r24129) -Feature [FS#3660]: Option to minimise signal distance when dragging over obstacles. (adf88) 12 years ago
rubidium 578c3218b0 (svn r23769) -Codechange: make the lag/join start timeouts configurable as well 13 years ago
rubidium f6329bf87e (svn r23764) -Fix [FS#4955]: make default timeouts for certain states lower and configurable 13 years ago
truebrain 17fea560ba (svn r23606) -Add: GameScanner, to auto-detect game scripts, and wire it in the console 13 years ago
frosch 91843ef9ad (svn r23497) -Add: Advanced display setting to control the linewidth in graphs. (ChillCore) 13 years ago
michi_cc fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
truebrain 36c06f639a (svn r23387) -Fix: move ai.script_max_opcode_till_suspend to script.script_max_opcode_till_suspend 13 years ago
peter1138 782aee3c2a (svn r23314) -Add: Add settings to restrict viewport zoom levels. 13 years ago
truebrain 08efac8549 (svn r23303) -Add: economy.fund_buildings, to disallow funding buildings 13 years ago
rubidium 41223c8bc9 (svn r23084) -Codechange: get rid of a redundant variable 13 years ago
rubidium cac4c2df20 (svn r22807) -Feature-ish: show a message about missing strings in the intro window if a certain (configurable) threshold has been reached and its not a stable release 13 years ago
rubidium cc6e55a246 (svn r22797) -Add: progress bar for scanning NewGRFs 13 years ago
rubidium 56fedc4db9 (svn r22767) -Add: river generation 13 years ago
frosch c1b1513815 (svn r22626) -Fix [FS#4622]: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings. 13 years ago
frosch ad541cb188 (svn r22417) -Add: an advanced setting to specify the default palette to use for NewGRFs without action 14 palette information; this makes the default choice independent from the used base graphics and '-i' option. 13 years ago
rubidium 2e5b1f178e (svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings 13 years ago
alberth 8c3041b3c9 (svn r22001) -Codechange: Rename difficulty.number_industries to difficulty.industry_density. 14 years ago
alberth f838069a44 (svn r22000) -Codechange: Introduce an enum for the industry density setting. 14 years ago
terkhen 67ce7c5c41 (svn r21974) -Feature: Add a setting to enable/disable funding local road reconstruction. 14 years ago
rubidium 088223e058 (svn r21962) -Feature-ish: GUI setting to disable reversing at signals 14 years ago
rubidium fd7633def5 (svn r21960) -Change: show the length of vehicles in tiles, instead of half tiles in the depot
-Fix [FS#4461]: don't count the number of vehicles but the length of vehicles to (configurably) limit train length
14 years ago
rubidium 7086bb3017 (svn r21959) -Change: replace longbridges with custom maximum bridge and tunnel length setting 14 years ago
rubidium 8ee493b6e9 (svn r21958) -Cleanup: join_stations setting; can done by distant join and could be subverted by distant join 14 years ago
rubidium c0f39415b9 (svn r21957) -Cleanup: gotodepot and timetabling settings are more or less useless; just don't use depot orders or timetabling if you don't want to use it 14 years ago
rubidium 285f369969 (svn r21956) -Cleanup: always draw the bridge pillars 14 years ago
rubidium 1a9ae166eb (svn r21955) -Cleanup: always show the long date in the status bar 14 years ago
rubidium 12d3422539 (svn r21954) -Cleanup: remove setting to not show the vehicle speed in the vehicle view 14 years ago
smatz 4aa45d8742 (svn r21953) -Remove [FS#4456]: the non-uniform stations setting. Support for uniform stations has been broken for over a year 14 years ago