Commit Graph

237 Commits (5199e19213bfad4c9cd145b2b606cc6ad4015244)

Author SHA1 Message Date
Jonathan G Rennison 5a07315405 Add train length and group name to vehicle details window.
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
9 years ago
Jonathan G Rennison 591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
9 years ago
Jonathan G Rennison 9c75a3c477 Enable building rivers in-game.
Controlled by setting, default off.
9 years ago
Jonathan G Rennison 58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 9 years ago
Jonathan G Rennison 381d11096f Bin no_trees_on_this_level, use exp. decay away from snow line.
Probability of placing an arctic tree is now an exponential decay
function of height distance from the snow line, instead of the previous
50% blocks.
This results in a more gradual thinning out of arctic trees in
each direction.
The algorithm is: p = exp(-3 * distance / range_setting),
using a rather crude approximation of the exponential function.

The no_trees_on_this_level setting is not really useful, and its
dual behaviour to disallow discrete height levels and turn on the
snow line behaviour is unintuitive.
Replace it with a simple on/off setting.
9 years ago
Jonathan G Rennison efe85200f0 Import Everest treeline patch 9 years ago
Jonathan G Rennison 671151474b Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 40ad3dea02 Auto separation: Add setting to scale vehicle lateness adjustments.
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.

The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.

Note that this is not savegame compatible.
9 years ago
Jonathan G Rennison f0fecda985 Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average.
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
Jonathan G Rennison 15c2327fd4 Merge branch 'master' into auto_timetables 9 years ago
Jonathan G Rennison 9565e5b9b1 Merge branch 'day_length-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
9 years ago
patch-import d86a56cbef Import day length patch
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
Jonathan G Rennison 4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
9 years ago
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
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison 20e2f363f1 Merge branch 'vehicle_repair_costs-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
9 years ago
Jonathan G Rennison 0a7441e56c Merge branch 'save_ext' into vehicle_repair_costs-sx
Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp
9 years ago
patch-import 7537ae2a7e Import vehicle repair costs patch
Strip trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
9 years ago
Jonathan G Rennison ba4e5dd62f Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
	src/vehicle.cpp
9 years ago
Jonathan G Rennison 33854a138f Merge branch 'save_ext' into auto_timetables-sx 9 years ago
Jonathan G Rennison 0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end,
whitespace & style, fix lang strings.
9 years ago
patch-import 80deb3c01d Import auto timetable separation patch
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
Jonathan G Rennison a8c2c394a5 Merge branch 'improved_breakdowns-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
9 years ago
patch-import 9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
Jonathan G Rennison 27c70542da Merge branch 'signal_tunnels_bridges-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
	src/signal.cpp
9 years ago
Jonathan G Rennison 9b4b170b2d Merge branch 'town_cargo_adj-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
9 years ago
Jonathan G Rennison 0afc054bff Merge branch 'adjacent_crossings-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 9 years ago
Jonathan G Rennison 60377f2262 Merge branch 'master' into town_cargo_adj
Conflicts:
	src/settings_gui.cpp
9 years ago
patch-import 1c9801e6b6 Import town cargo generation factor patch
Adjust whitespace

http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
9 years ago
Jonathan G Rennison 9f79c555da Merge branch 'save_ext' into signal_tunnels_bridges-sx 9 years ago
patch-import 59b0b18aa2 Import signals on tunnels and bridges patch
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
patch-import fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
frosch 3d37abf802 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 10 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 14 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
rubidium 79c908d6f3 (svn r21826) -Fix [FS#4007]: the expectations from the "always build infrastructure" setting name/description didn't match the behaviour 14 years ago
rubidium be077e030e (svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company 14 years ago
yexo 8ae90addd6 (svn r21695) -Codechange: add helper function to get the currently applicable GameSettings object 14 years ago
planetmaker bb07f9a3aa (svn r21656) -Fix [FS#4345] (r3722, r15301): Use a bool instead of uint8 to store a bool and use the dedicated accessor function when reading boolean settings (glx, rubidium) 14 years ago
rubidium 30e78752a9 (svn r21513) -Feature [FS#532]: make the chat message timeout user configurable 14 years ago
rubidium 2d661c3e84 (svn r21505) -Change: generalise the lost_train_warning setting to lost_vehicle_warning 14 years ago
rubidium 7bed9deb4f (svn r21426) -Change: introduce a setting for the types of commands that are allowed to be executed while paused 14 years ago
rubidium 71abb66b46 (svn r21363) -Add: support for limiting the amount of (accepted) incoming data 14 years ago
rubidium 9bdf6a36f4 (svn r21179) -Fix [FS#4201] (r69): if the main toolbar's location is configurable, why isn't the statusbar's location configurable? 14 years ago
planetmaker 98de280343 (svn r21116) -Add [FS#3012]: Reduce the chances to accidentially break savegames with NewGRFs 14 years ago
rubidium 28832b68f5 (svn r20973) -Add: chat sending and receiving support for remote admins (dihedral) 14 years ago
rubidium 7d42a44556 (svn r20966) -Change: enable remote administration sockets (parts by Yexo and dihedral) 14 years ago
rubidium 39f7c1cf15 (svn r20965) -Fix: typo in comment 14 years ago