Jonathan G Rennison
c6854afcef
Pause the game instead of blocking when link graph jobs lag.
...
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
9 years ago
Jonathan G Rennison
5108a71240
SpringPP load: remove wait for cargo orders.
9 years ago
Jonathan G Rennison
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison
c751bba17c
Bump SLXI tracerestrict version due to reserve through new feature.
9 years ago
Jonathan G Rennison
8f4c216b3f
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
Jonathan G Rennison
73b69c5594
Validate type of all instructions, log validation failures at load.
...
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
9 years ago
Jonathan G Rennison
d9acfc4599
Fix validation of dual item instructions.
9 years ago
Jonathan G Rennison
e2435c7169
Only run trace restrict programs if they contain relevant actions.
...
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
9 years ago
Jonathan G Rennison
06a1d7c5c9
Add reserve through action to trace restrict programs.
...
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
9 years ago
Jonathan G Rennison
06cc930e47
Improve insertion and removal of 'or if' conditionals.
...
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
9 years ago
Jonathan G Rennison
2edfccd187
SpringPP load: Fix loading when day-length > 1
...
Adjust value of _date_fract.
9 years ago
translators
246df66229
(svn r27391) -Update from WebTranslator v3.0:
...
english_US - 2 changes by Supercheese
9 years ago
Jonathan G Rennison
32dffceaa0
Merge branch 'order_occupancy-sx' into jgrpp
9 years ago
Jonathan G Rennison
e9d3e6fad2
Merge branch 'order_occupancy' into order_occupancy-sx
9 years ago
Jonathan G Rennison
0cf7428f85
Fix crash in competitor orders GUI.
...
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
9 years ago
Jonathan G Rennison
ce15bdc08f
Merge branch 'save_ext_spp' into jgrpp
9 years ago
Jonathan G Rennison
44a41ba13e
Fix traffic light removal not deleting animated tile.
9 years ago
Jonathan G Rennison
6e505ceab1
Fix missing template definition in company_settings.
9 years ago
Jonathan G Rennison
60ba68cc69
Update departure board to handle changed minutes.
...
Use scaled date ticks internally.
9 years ago
Jonathan G Rennison
0b22a8e5c6
Changes to timetable GUI to handle minutes change.
...
Use scaled date ticks internally.
Update date entry GUI.
9 years ago
Jonathan G Rennison
29809f2001
Time in minutes is no longer scaled by day length.
...
Time in minutes now based on the existing date ticks * the day length,
plus the tick skip counter, instead of just the date ticks.
Change the format of the {DATE_WALLCLOCK_*} string params
to use date ticks scaled by the day length, as above.
Update status bar clock.
9 years ago
translators
ee8bee5e31
(svn r27390) -Update from WebTranslator v3.0:
...
korean - 1 changes by telk5093
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
8357b911e5
Merge branch 'more_cond_orders-sx' into jgrpp
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison
77bcd5f2c2
More conditional orders: Extended save/load changes.
9 years ago
Jonathan G Rennison
0372bfcda7
Merge branch 'save_ext' into more_cond_orders-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison
33233e8575
Fix references to renamed variables.
...
Update comment on Order::UpdateJumpCounter.
9 years ago
Jonathan G Rennison
ffdd845b1c
Merge branch 'master' into more_cond_orders
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/saveload.cpp
src/saveload/saveload.h
9 years ago
Jonathan G Rennison
ea5c33029b
Fix various whitespace and style issues.
9 years ago
Jonathan G Rennison
218758fc86
Remove some of the Russian translations, as they are out-of-sync.
9 years ago
patch-import
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
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
805986811a
Merge branch 'save_ext' into jgrpp
9 years ago
Jonathan G Rennison
bdf0216bf0
Avoid closing nested templates with >> for backwards compatibility.
9 years ago
Jonathan G Rennison
659b6b7337
PATX settings: Various changes to support legacy compilers.
9 years ago
Jonathan G Rennison
9c75a3c477
Enable building rivers in-game.
...
Controlled by setting, default off.
9 years ago
Jonathan G Rennison
e257b23cba
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
Jonathan G Rennison
6c32cca5b9
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
Jonathan G Rennison
38aaf8a921
Fix compilation on legacy compilers.
9 years ago
Jonathan G Rennison
58780fb109
Merge branch 'everest_treeline-sx' into jgrpp
9 years ago
Jonathan G Rennison
3caa662c77
Timetable GUI: Scale dates/times by day length factor.
9 years ago
Jonathan G Rennison
010c290511
Departures: Scale dates in departures window by day length factor.
9 years ago
Jonathan G Rennison
803e8970c3
Departures: Fix major memory leak in MakeDepartureList.
9 years ago
Jonathan G Rennison
c6f38acbd6
Departures: Fix indentation/whitespace issues.
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
frosch
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
translators
8f36c49ffa
(svn r27388) -Update from WebTranslator v3.0:
...
dutch - 4 changes by TheTycoonist
9 years ago
Jonathan G Rennison
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
9 years ago
Jonathan G Rennison
6643d0a661
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
88d45e5e2c
Clear rail ageing data on load.
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
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
translators
284c9dd342
(svn r27387) -Update from WebTranslator v3.0:
...
dutch - 2 changes by TheTycoonist
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
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
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
d3bab84374
Apply rename/typo fix of XSLFI_IMPROVED_BREAKDOWNS.
9 years ago
Jonathan G Rennison
55af40c456
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
9 years ago
Jonathan G Rennison
6d5833dfe8
Merge branch 'house_placing' into jgrpp
9 years ago
Jonathan G Rennison
74e5d97fcb
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
Jonathan G Rennison
a5f00c1df5
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
9 years ago
Jonathan G Rennison
20f1f48983
Fix add/removing signals on bridges/tunnels not checking train occupancy.
...
Fix compiler warning.
9 years ago
Jonathan G Rennison
3e8611fca1
House placing: Fix uninitialised variable.
9 years ago
Jonathan G Rennison
880d455ea9
Merge branch 'progsig-sx' into jgrpp
9 years ago
Jonathan G Rennison
0693d3678a
Progsig: Fix some benign compiler warnings and whitespace issues.
9 years ago
Jonathan G Rennison
9283ae38df
Merge branch 'save_ext' into progsig-sx
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
ef5ecdb2c7
Merge branch 'git_findversion_fix' into save_ext
9 years ago
Jonathan G Rennison
0f88bcf380
Merge branch 'improved_breakdowns-sx' into jgrpp
9 years ago
Jonathan G Rennison
1ead315e42
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
6d695a1426
Merge branch 'master' into improved_breakdowns
9 years ago
Jonathan G Rennison
9716026809
Merge branch 'jgrpp' into save_ext_spp
9 years ago
Jonathan G Rennison
bcdae2ff21
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
Jonathan G Rennison
6088c7fc24
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
Jonathan G Rennison
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
translators
8cfc1e9d23
(svn r27386) -Update from WebTranslator v3.0:
...
dutch - 3 changes by TheTycoonist
9 years ago
rubidium
3b8aabdd9e
(svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library
9 years ago
translators
70322bce59
(svn r27384) -Update from WebTranslator v3.0:
...
catalan - 35 changes by juanjo
9 years ago
rubidium
8f711aca53
(svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference
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
87c8bb74bd
Merge branch 'service_autorenew' into jgrpp
9 years ago
Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
Jonathan G Rennison
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
Jonathan G Rennison
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
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
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
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
9 years ago