efe85200f0
Import Everest treeline patch
9 years ago
8c389a2a96
(svn r27389) -Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough.
9 years ago
8f36c49ffa
(svn r27388) -Update from WebTranslator v3.0:
...
dutch - 4 changes by TheTycoonist
9 years ago
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
9 years ago
6643d0a661
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
8faead7e7a
Graphically indicate restricted signals by recolouring the signal post.
...
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
9 years ago
88d45e5e2c
Clear rail ageing data on load.
9 years ago
96ccd9333a
Clear PAX stations/signals and traffic lights on load.
...
This clears the tracerestrict bit if there are no mappings on a tile.
9 years ago
614b3d8ab5
Trace restrict: Handle removing mapping from refcount 2 empty program.
...
Instead of leaving the other mapping pointing to an empty unshared
program, find and delete it.
9 years ago
284c9dd342
(svn r27387) -Update from WebTranslator v3.0:
...
dutch - 2 changes by TheTycoonist
9 years ago
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
279eac6e57
Reject SpringPP games with huge airports or helis approaching oil rigs.
...
Huge airports are not supported.
Annoyingly SpringPP has a bug where it uses the same ID for
AT_INTERCONTINENTAL2 and AT_OILRIG.
Consequently any aircraft approaching an oil rig in an SPP game
will be using the wrong aircraft movement data, and this will go
badly wrong as soon as the game is unpaused.
9 years ago
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
d3bab84374
Apply rename/typo fix of XSLFI_IMPROVED_BREAKDOWNS.
9 years ago
55af40c456
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
9 years ago
6d5833dfe8
Merge branch 'house_placing' into jgrpp
9 years ago
74e5d97fcb
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
a5f00c1df5
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
9 years ago
20f1f48983
Fix add/removing signals on bridges/tunnels not checking train occupancy.
...
Fix compiler warning.
9 years ago
3e8611fca1
House placing: Fix uninitialised variable.
9 years ago
880d455ea9
Merge branch 'progsig-sx' into jgrpp
9 years ago
0693d3678a
Progsig: Fix some benign compiler warnings and whitespace issues.
9 years ago
9283ae38df
Merge branch 'save_ext' into progsig-sx
9 years ago
034279c0e8
Merge branch 'save_ext' into jgrpp
9 years ago
a8cc81d054
Initialiser list fixes for legacy compilers.
9 years ago
ef5ecdb2c7
Merge branch 'git_findversion_fix' into save_ext
9 years ago
0f88bcf380
Merge branch 'improved_breakdowns-sx' into jgrpp
9 years ago
1ead315e42
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
9 years ago
0650568aee
Improved breakdowns: Fix setting string being in the middle of a string range.
...
Looking at or selecting the gui.stop_location setting triggered
an assertion failure.
Move the string out of the setting range.
9 years ago
6d695a1426
Merge branch 'master' into improved_breakdowns
9 years ago
9716026809
Merge branch 'jgrpp' into save_ext_spp
9 years ago
bcdae2ff21
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
6088c7fc24
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
8cfc1e9d23
(svn r27386) -Update from WebTranslator v3.0:
...
dutch - 3 changes by TheTycoonist
9 years ago
3b8aabdd9e
(svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library
9 years ago
70322bce59
(svn r27384) -Update from WebTranslator v3.0:
...
catalan - 35 changes by juanjo
9 years ago
8f711aca53
(svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference
9 years ago
671151474b
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/settings_gui.cpp
9 years ago
87c8bb74bd
Merge branch 'service_autorenew' into jgrpp
9 years ago
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
dd2805da8c
Servicing: send vehicles which need auto-renewing due to age for servicing,
...
even if breakdowns are off and no servicing if no breakdowns is on.
9 years ago
25bc8eb1e2
Save/load changes for timetable_separation_rate setting.
9 years ago
adb3156951
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
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
cca6495d1e
Auto timetabling: bias timetable adjustment to favour negative adjustments.
...
This is to prevent positive feedback where timetable times are increased
due to congestion, which creates more congestion due to trains waiting
for extended periods at stations and/or due to timetable auto separation
going overboard due to overly long timetables.
* Double rate of negative adjustments.
* Half rate of positive adjustments.
* Only do step changes for large negative adjustments.
* Reduce jam detection threshold.
9 years ago
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
9 years ago
63aa9f4ea8
(svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode.
9 years ago
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
9 years ago
6b0e63e054
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
15f3abf47d
Fix typo in save/load ext feature enum name for improved breakdown.
9 years ago
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
fdce64ddae
Save/load changes for order occupancy
9 years ago
52c07d1f51
Merge branch 'save_ext' into order_occupancy-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
46103362c3
Fix for loading of SPP games games with aircraft.
9 years ago
4fb0f9bacc
SPP loader: Adjust inflation cost scaling on load.
...
SpringPP divides all prices by the difficulty factor, effectively making
things about 8 times cheaper. Adjust the inflation factor to compensate
for this, as otherwise the game is unplayable on load if inflation has
been running for a while. To avoid making things too cheap, clamp the
price inflation factor to no lower than the payment inflation factor.
9 years ago
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
bd10b0fb0b
Merge branch 'departure-boards-sx' into jgrpp
9 years ago
365f1c237f
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
d5f9709c56
Merge branch 'departure-boards' into departure-boards-sx
9 years ago
1795fb5953
Fix departure boards with orders with timetabled 0 travel times,
...
e.g. those with depot service orders.
9 years ago
346cebab43
Merge branch 'master' into departure-boards
9 years ago
f820bbe0c5
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
d24f7763cc
Fix auto timetable separation to handle non-station orders sensibly.
9 years ago
34e41a2e26
Timetable GUI: Allow clearing of timetable time fields which are at 0.
...
Allow explicitly setting timetable time fields to 0 without clearing them.
9 years ago
15c2327fd4
Merge branch 'master' into auto_timetables
9 years ago
eb4b6a08d0
(svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal
9 years ago
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
41062cf78e
Save/load changes for variable day length patch.
9 years ago
ee700fd3b1
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
9 years ago
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
45d060f46f
Day length patch: minor tweak to timetable lateness calculation.
...
_date_fract should also be multiplied by day length factor.
9 years ago
d70dbda351
Merge branch 'master' into day_length
9 years ago
e0bc6e0cf6
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
316b3a4acc
Merge branch 'master' into save_ext
9 years ago
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
9f72662ecc
(svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font.
9 years ago
c9120cd714
(svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines.
9 years ago
a9200aa69a
(svn r27364) -Update from WebTranslator v3.0:
...
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
9 years ago
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
9 years ago
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
9 years ago
135d159fc1
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
e1defe24c7
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
...
Conflicts:
src/table/settings.ini
9 years ago
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
6c971f9a55
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
8386cc3c1b
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
5540374227
Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode.
...
Don't use water tile accessors on aqueduct bridge heads.
9 years ago
6d6d2f2f0a
Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp
9 years ago
bde8f04f73
Town rating label: Fix viewport tiny strings having wrong colour for
...
"very good" and "excellent" ratings.
9 years ago
b7f1019dc7
Merge branch 'master' into town-rating-label
...
Conflicts:
src/town_cmd.cpp
9 years ago
84f9274640
Merge branch 'save_ext' into departure-boards-sx
9 years ago
0055e283f1
Merge branch 'save_ext' into improved_breakdowns-sx
9 years ago
2f8d330307
Merge branch 'save_ext' into infrastructure_sharing-sx
9 years ago
e30d7c2164
Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame().
9 years ago
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
9 years ago
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
b3ebb1f729
Infrastructure sharing patch: save/load changes.
9 years ago
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
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
44ed3cb3bd
Merge branch 'town-rating-label' into jgrpp
...
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
9 years ago
33d395ad59
Import town rating label patch
...
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
9 years ago
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
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
9 years ago
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
9 years ago
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
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
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
6bb8d5087d
Vehicle repair costs patch: implement save/load changes.
9 years ago
0a7441e56c
Merge branch 'save_ext' into vehicle_repair_costs-sx
...
Conflicts:
src/saveload/saveload.cpp
src/settings_gui.cpp
9 years ago
938babfe7b
Vehicle repair costs patch: whitespace fixes.
9 years ago
7537ae2a7e
Import vehicle repair costs patch
...
Strip trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
9 years ago
7a3fb02d5a
Merge branch 'house_placing' into jgrpp
9 years ago
3ec3842ad4
Fix town_gui.h header file not being in imported diff
...
Use copy from http://www.tt-forums.net/viewtopic.php?p=1099696#p1099696
9 years ago
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
2e45dac18a
Auto timetables patch: save/load changes, document rationale for
...
moving addition to VehicleFlags
9 years ago
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
163423e7b5
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
9 years ago
c4565f6bb0
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
76707fb72a
Change pf penalty restriction value button to preset values and a custom option.
...
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
9 years ago
c7f4b3fe6f
Merge branch 'smallmap-screenshot' into jgrpp
9 years ago
948b4e1d5e
Implement taking smallmap screenshots.
...
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
9 years ago
ce34225b0e
Merge branch 'house_placing' into jgrpp
9 years ago
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
675993805b
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
09f8ff420f
Merge branch 'tracerestrict' into tracerestrict-sx
...
Conflicts:
src/tracerestrict_gui.cpp
9 years ago
a0520b8937
Initial implementation of PBS entry signal condition variable.
...
TODO: see how the efficiency of this can be improved.
9 years ago
116bd41101
Initial support for multi-item instructions.
...
This involves various changes to instruction modification actions,
and the GUI code.
9 years ago
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
1fbd4a9d1d
Timetable wait in depot: Add info to SLXI chunk.
9 years ago
a3b0057011
Merge branch 'save_ext' into wait_in_depot-sx
9 years ago
2f9ebebf02
Merge branch 'master' into wait_in_depot
9 years ago
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
a2eac188de
Merge branches 'save_ext', 'tracerestrict-sx', 'departure-boards-sx', 'town_cargo_adj-sx', 'signal_tunnels_bridges-sx', 'adjacent_crossings-sx' and 'progsig-sx' into jgrpp
9 years ago
bc8b2d9826
Merge branch 'save_ext' into tracerestrict-sx
9 years ago
77ec2aac58
Merge branch 'save_ext' into progsig-sx
9 years ago
8fe9a7430c
Merge branch 'save_ext' into departure-boards-sx
9 years ago
012ce322d5
Merge branch 'save_ext' into town_cargo_adj-sx
9 years ago
6ac6759b00
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
7cc71ce2a5
Merge branch 'save_ext' into adjacent_crossings-sx
9 years ago
Jonathan G Rennison
frosch
translators
rubidium
michi_cc
alberth
patch-import