Jonathan G Rennison
ac016eae5e
Add client setting to enable shared order group window for single vehicles
7 years ago
Jonathan G Rennison
9ed0541e77
Import town bridges over rails patch
...
Add setting (default off)
From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
7 years ago
Jonathan G Rennison
4db69283c1
Add setting to disable removing sea/rivers
7 years ago
Jonathan G Rennison
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
Jonathan G Rennison
5a2fe49457
Add setting for transfer payment mode from source, minus transfers.
...
This is to reduce large negative payments for the final leg.
7 years ago
Jonathan G Rennison
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
Jonathan G Rennison
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
Jonathan G Rennison
7dbf99fa33
Add UI setting to hide adv tracerestrict features from GUI
...
Hide wait at PBS and slot features.
7 years ago
Jonathan G Rennison
7194e19380
Merge branch 'save_ext' into tracerestrict-sx
7 years ago
peter1138
d934ef9b00
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
peter1138
0e68f9db70
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
Jonathan G Rennison
212f6ce6ef
Chunnel: Add setting to enable construction, default off.
7 years ago
patch-import
7b88f7a290
Add minimum town distance patch, with minor modifications
...
Move implicitly added value of 20 to setting default.
Adjust setting texts.
From: https://www.tt-forums.net/viewtopic.php?p=1095146#p1095146
7 years ago
Jonathan G Rennison
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
7 years ago
Jonathan G Rennison
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
Jonathan G Rennison
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
Jonathan G Rennison
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
Jonathan G Rennison
f0bcec77fb
Import patch for random town road reconstruction.
...
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438
Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
8 years ago
Jonathan G Rennison
f0fee802a9
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison
0ab2abbc23
Add client setting to show train weight ratios in details header.
...
Off by default.
8 years ago
Jonathan G Rennison
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
Jonathan G Rennison
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
Jonathan G Rennison
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
8 years ago
Jonathan G Rennison
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
8 years ago
Jonathan G Rennison
efcdd6c36f
Remove global automated timetable setting.
8 years ago
Jonathan G Rennison
ff5ee52b94
Add a company setting to control auto-fill timetable rounding.
8 years ago
Jonathan G Rennison
04b188bd7d
Add client setting to show leftover ticks in timetable.
8 years ago
Jonathan G Rennison
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
patch-import
0fd34a17a5
Update to v4 of house placing patch.
8 years ago
Jonathan G Rennison
7bc407e2f8
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_type.h
# src/table/settings.ini
8 years ago
Jonathan G Rennison
1818a83e63
Add setting to control whether trains can crash with other companies'.
8 years ago
Jonathan G Rennison
1f5535c0b1
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
8 years ago
Jonathan G Rennison
a27bdbb3e2
Add company settings to enable competitors' to buy/renew in own depots.
8 years ago
Jonathan G Rennison
78cf5ca682
Add setting for linkgraph times to be in non daylength scaled days.
...
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
9 years ago
patch-import
c5f9d8b6de
Import reduced tree patch
...
http://www.tt-forums.net/viewtopic.php?p=890778#p890778
Update to recent trunk, use extended savegame framework.
Add setting help text, tweak setting name.
Pre-calculate tree growth probabilities.
9 years ago
Jonathan G Rennison
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
9 years ago
Jonathan G Rennison
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
9 years ago
Jonathan G Rennison
b43962f0bd
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/vehicle_sl.cpp
src/settings_type.h
9 years ago
Jonathan G Rennison
5e924262f4
Fix speed reduction after critical breakdowns.
...
Previous code set vcache.cached_max_speed directly (and incorrectly),
which did not survive across save/load or network joins.
Instead add a struct Train field to store the number
of critical breakdowns since last service and do the speed reduction
properly in Train::ConsistChanged.
Slightly tweak algorithm for speed reduction.
9 years ago
Jonathan G Rennison
69f3844d2e
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/settings_gui.cpp
src/settings_type.h
src/table/settings.ini
9 years ago
Jonathan G Rennison
a93714a720
Add setting to show restricted electric signals using the default sprites.
...
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
Jonathan G Rennison
6075dd22e2
Show small square if vehicle owner does not match list owner.
...
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
9 years ago
Jonathan G Rennison
b48a01f233
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/settings_gui.cpp
src/settings_type.h
9 years ago
Jonathan G Rennison
60a677692e
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/settings_gui.cpp
src/table/company_settings.ini
9 years ago
Jonathan G Rennison
26d32269a3
Make auto TT separation rate a company setting.
...
Move auto TT by default setting to PLYX chunk.
9 years ago
Jonathan G Rennison
6d263226d8
Move order occupancy smoothness to company settings.
9 years ago
Jonathan G Rennison
e9dc82c801
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison
42370dc28d
Add company setting to auto-enable auto timetables for new vehicles.
...
Default: off.
9 years ago
Jonathan G Rennison
5d7ad2ba7b
Merge branch 'vehicle_details_gui_additions' into jgrpp
...
Conflicts:
src/table/settings.ini
9 years ago
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
frosch
2f7de4fd99
(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
ddfc8372ee
(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
rubidium
f41b55f0ff
(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
planetmaker
61e129cc22
(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
rubidium
f9c9ff6ec3
(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
0fc198cb00
(svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI
11 years ago