Commit Graph

202 Commits (38969521365d78bcd09afe522741bdfb2c93d291)

Author SHA1 Message Date
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