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
07aba3eb84
Merge branch 'tracerestrict' into tracerestrict-sx
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
a380573c32
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
Jonathan G Rennison
6d263226d8
Move order occupancy smoothness to company settings.
9 years ago
Jonathan G Rennison
8001d86350
Merge branch 'save_ext' into order_occupancy-sx
9 years ago
Jonathan G Rennison
ce15bdc08f
Merge branch 'save_ext_spp' into jgrpp
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
bbc131ce47
Merge branch 'jgrpp' into save_ext_spp
...
Conflicts:
src/saveload/order_sl.cpp
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
64a6f5c0d4
Merge branch 'jgrpp' into save_ext_spp
9 years ago
Jonathan G Rennison
efb1ba3337
Add GUI settings and setting/help texts.
...
Move tree-related functions into their own GUI sub-category.
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
3b120c6cbd
Merge branch 'save_ext' into everest_treeline-sx
9 years ago
Jonathan G Rennison
efe85200f0
Import Everest treeline patch
9 years ago
Jonathan G Rennison
ba8d8d99b8
Add support for loading SpringPP savegame versions 221 and 222.
...
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
9 years ago
Jonathan G Rennison
b5c453b21e
Add generic mechanism to cross-ref settings at load time.
...
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
9 years ago
Jonathan G Rennison
034279c0e8
Merge branch 'save_ext' into jgrpp
9 years ago
Jonathan G Rennison
a8cc81d054
Initialiser list fixes for legacy compilers.
9 years ago
Jonathan G Rennison
9716026809
Merge branch 'jgrpp' into save_ext_spp
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
25bc8eb1e2
Save/load changes for timetable_separation_rate setting.
9 years ago
Jonathan G Rennison
adb3156951
Merge branch 'auto_timetables' into auto_timetables-sx
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
fdce64ddae
Save/load changes for order occupancy
9 years ago
Jonathan G Rennison
52c07d1f51
Merge branch 'save_ext' into order_occupancy-sx
...
Conflicts:
src/saveload/saveload.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
39608841f2
Initial support for loading savegames from SpringPP v2.0.102/103
...
Savegame version 220
Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
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
Jonathan G Rennison
41062cf78e
Save/load changes for variable day length patch.
9 years ago
Jonathan G Rennison
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.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
135d159fc1
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
Jonathan G Rennison
e1defe24c7
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
...
Conflicts:
src/table/settings.ini
9 years ago
Jonathan G Rennison
65b1586f98
Infra sharing: Fix sharing fee settings not being shown as currency.
...
Settings were shown as (invalid string).
Fix water/dock sharing fee setting using wrong string.
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
b3ebb1f729
Infrastructure sharing patch: save/load changes.
9 years ago
Jonathan G Rennison
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.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