Charles Pigott
f20b75d712
Codechange: Remove TownLayoutByte type
5 years ago
Charles Pigott
0e439aeab7
Codechange: Remove TownFoundingByte type
5 years ago
Charles Pigott
96a4787710
Codechange: Set ZoomLevel's base type to byte instead of using ZoomLevelByte
5 years ago
Jonathan G Rennison
a6ea1ea408
Allow articulated road vehicles to overtake other vehicles
...
Add setting
5 years ago
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
Patric Stout
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
5 years ago
Charles Pigott
fe448a2616
Remove: OPF
5 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
PeterN
dd20ccee88
Feature: Industries with neutral stations (e.g. Oil Rig) only supply/accept cargo to/from their neutral station. ( #7234 )
...
This change is a controlled by a game setting, located under Environment ->
Industries which allows toggling the behaviour. It defaults to enabled.
"Company stations can serve industries with attached neutral stations"
When enabled, industries with attached neutral station (such as Oil Rigs) may
also be served by company-owned stations built nearby. This is the traditional
behaviour.
When disabled, these industries may only be served by their neutral station.
Any nearby company-owned stations won't be able to serve them, nor will the
neutral station serve anything else other than the industry.
5 years ago
Peter Nelson
b8a0107ad1
Change: Add configurable curve penalty for ships.
5 years ago
Niels Martin Hansen
52572cafa6
Add: Option for population-linear town cargo generation
...
Introduce a new default algorithm for town cargo generation (passengers and mail), and a game setting to choose between the new and original algorithm.
The original town cargo generation algorithm has the property of the generated amount relating to the square of each building's population, meaning large towns easily produce more cargo than can realistically be transported. The problem is excessive cargo is amplified if playing with cargodist.
The new algorithm introduced instead has a linear relation to the population. The result is that smaller towns will produce slightly more cargo, while the largest towns will produce about a fourth of what they would with the original algorithm.
Existing savegames will use the original algorithm, while new games will default to the new algorithm.
5 years ago
Jonathan G Rennison
60c2f0ebc8
Remove now unused town_bridge_over_rail setting, feature in trunk
5 years ago
Jonathan G Rennison
705fc18b08
Add company setting to advance order when cloning/copying/sharing
...
Advance order if current depot is in order list
5 years ago
Jonathan G Rennison
7b8db50fd5
Add UI setting for whether to open new vehicle GUI when share-cloning
5 years ago
Jonathan G Rennison
4c8b358ffe
Add game setting to allow only non-stop orders for ground vehicles
5 years ago
Jonathan G Rennison
3a77f75bf6
Add GUI setting to control savegame overwrite confirmation dialog
...
Adjust game ID indications in save window UI
5 years ago
Jonathan G Rennison
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
5 years ago
Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
Gabda87
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
5 years ago
Jonathan G Rennison
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
damfr
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
Jonathan G Rennison
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
Jonathan G Rennison
4bdbf3863d
Add setting to allow placing stations under bridges
6 years ago
Jonathan G Rennison
56bde8ce18
Add setting to allow placing all NewGRF objects under bridges
6 years ago
Jonathan G Rennison
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
6 years ago
Niels Martin Hansen
4fb76db42f
Feature #986 : Automatic save when losing connection to a network game
6 years ago
Jonathan G Rennison
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
Jonathan G Rennison
e82ccad052
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
6 years ago
Jonathan G Rennison
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
Jonathan G Rennison
d2d8a86814
Add setting: station rating waiting time tolerance depends on cargo class
6 years ago
Jonathan G Rennison
7559db2bbb
Merge remote-tracking branch 'nielsmh/bug986' into jgrpp
6 years ago
Niels Martin Hansen
db5abdd78a
Feature #986 : Automatic save when losing connection to a network game
6 years ago
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
PeterN
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
Jonathan G Rennison
6ec78ff4b0
Add UI setting to disable mass action buttons for top-level vehicle lists
6 years ago
Jonathan G Rennison
7aab49e282
Add setting to enable through loading in UI
6 years ago
Jonathan G Rennison
9a1a5a9d68
Increase maximum value of ticks per minute setting
6 years ago
Jonathan G Rennison
097cf9b0b1
Add UI setting to control whether cargo filter drop down is shown
7 years ago
Jonathan G Rennison
aa138baec9
Add UI setting for whether programmable signals shown in UI (default off)
...
Add setting subcategory for advanced signal features
7 years ago
Jonathan G Rennison
c3a9eca1a9
Add town growth setting, rate depends on proportion of transported cargo
7 years ago
Jonathan G Rennison
36a712a579
Add very and extremely slow options to town growth rate setting
7 years ago
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.
7 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.
8 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.
8 years ago
Jonathan G Rennison
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
8 years ago
Jonathan G Rennison
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
8 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
8 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.
8 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.
9 years ago
frosch
2f7de4fd99
(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
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
fonsinchen
848ca543a2
(svn r25351) -Add: settings for link graph
11 years ago
fonsinchen
a49a4eec6e
(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
planetmaker
c24374f99c
(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
3ce8d2ce70
(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
345c3203d7
(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
21b43b63f5
(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
6bb43a6561
(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
d1ab0f03bc
(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
812ae4140a
(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
a499435351
(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
5b2da98ca3
(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
dc930b6689
(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
72fc771039
(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
frosch
e1fda49027
(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
f3e295b4ec
(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
michi_cc
708d5b6712
(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
182969f531
(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
rubidium
bddfcaef95
(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
truebrain
c99950c215
(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
frosch
1ea449630d
(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
michi_cc
d3b7b89493
(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
truebrain
9dde1287aa
(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
peter1138
4e97261315
(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
truebrain
e30256692f
(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
47c5d30b5d
(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
0ad82be1f3
(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
dc5f44883b
(svn r22797) -Add: progress bar for scanning NewGRFs
13 years ago
rubidium
56fedc4db9
(svn r22767) -Add: river generation
13 years ago
rubidium
0041408e4f
(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