dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,483 Commits 1 Branch 0 Tags
ec08a32c94c28fa1b61d45f74fa0f5d3315e594d
Commit Graph

190 Commits

Author SHA1 Message Date
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles. 
Default: off.
 2015-09-03 23:27:26 +01:00
Jonathan G Rennison
5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp 
Conflicts:
	src/table/settings.ini
 2015-08-30 17:10:19 +01:00
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.
 2015-08-30 17:09:43 +01:00
Jonathan G Rennison
591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
 2015-08-26 19:09:38 +01:00
Jonathan G Rennison
9c75a3c477 Enable building rivers in-game. 
Controlled by setting, default off.
 2015-08-25 23:44:28 +01:00
Jonathan G Rennison
58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 2015-08-22 01:29:53 +01:00
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.
 2015-08-21 21:17:18 +01:00
Jonathan G Rennison
efe85200f0 Import Everest treeline patch 2015-08-21 18:16:15 +01:00
Jonathan G Rennison
671151474b Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/settings_gui.cpp
 2015-08-11 21:43:12 +01:00
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.
 2015-08-11 21:20:01 +01:00
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
 2015-08-09 23:45:21 +01:00
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.
 2015-08-09 23:39:55 +01:00
Jonathan G Rennison
15c2327fd4 Merge branch 'master' into auto_timetables 2015-08-09 17:07:41 +01:00
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
 2015-08-09 13:51:36 +01:00
patch-import
d86a56cbef Import day length patch 
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
 2015-08-09 11:23:15 +01:00
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
 2015-08-06 23:11:49 +01:00
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
 2015-08-06 22:55:09 +01:00
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
 2015-08-06 22:24:28 +01:00
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
 2015-08-05 21:54:11 +01:00
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
 2015-08-05 21:25:13 +01:00
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
 2015-08-05 21:24:30 +01:00
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
 2015-08-04 23:59:12 +01:00
Jonathan G Rennison
0a7441e56c Merge branch 'save_ext' into vehicle_repair_costs-sx 
Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp
 2015-08-04 23:56:05 +01:00
patch-import
7537ae2a7e Import vehicle repair costs patch 
Strip trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
 2015-08-04 23:38:35 +01:00
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
 2015-08-04 22:08:59 +01:00
Jonathan G Rennison
33854a138f Merge branch 'save_ext' into auto_timetables-sx 2015-08-04 21:30:30 +01:00
Jonathan G Rennison
0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end, 
whitespace & style, fix lang strings.
 2015-08-04 21:29:19 +01:00
patch-import
80deb3c01d Import auto timetable separation patch 
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
 2015-08-04 21:27:23 +01:00
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
 2015-08-02 23:43:19 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +01:00
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
 2015-08-02 18:45:32 +01:00
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
 2015-08-02 18:24:45 +01:00
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
 2015-08-02 18:23:25 +01:00
Jonathan G Rennison
0afc054bff Merge branch 'adjacent_crossings-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-02 18:18:41 +01:00
Jonathan G Rennison
09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 2015-08-02 17:49:25 +01:00
Jonathan G Rennison
60377f2262 Merge branch 'master' into town_cargo_adj 
Conflicts:
	src/settings_gui.cpp
 2015-08-02 00:04:04 +01:00
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
 2015-08-01 23:56:58 +01:00
Jonathan G Rennison
9f79c555da Merge branch 'save_ext' into signal_tunnels_bridges-sx 2015-08-01 20:27:19 +01:00
patch-import
59b0b18aa2 Import signals on tunnels and bridges patch 
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
 2015-08-01 20:25:59 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
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.
 2015-08-01 17:06:43 +01:00
frosch
3d37abf802 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 2015-02-12 20:00:23 +00:00
rubidium
d17a4e0918 (svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height 2014-09-21 12:02:03 +00:00
rubidium
ab3660278a (svn r26880) -Add: stub settings for limiting bridge and map height 2014-09-21 11:27:34 +00:00
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 2014-09-13 13:30:31 +00:00
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)
 2013-06-29 09:47:18 +00:00
fonsinchen
7b2f8a885e (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 2013-06-09 13:08:52 +00:00
fonsinchen
848ca543a2 (svn r25351) -Add: settings for link graph 2013-06-09 12:56:35 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00