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.
2015-08-19 18:55:02 +01:00
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.
2015-08-19 18:52:49 +01:00
translators
284c9dd342
(svn r27387) -Update from WebTranslator v3.0:
...
dutch - 2 changes by TheTycoonist
2015-08-19 17:45:15 +00:00
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.
2015-08-18 23:08:34 +01:00
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.
2015-08-17 21:41:05 +01:00
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.
2015-08-17 20:11:30 +01:00
Jonathan G Rennison
d3bab84374
Apply rename/typo fix of XSLFI_IMPROVED_BREAKDOWNS.
2015-08-17 20:08:47 +01:00
Jonathan G Rennison
01c938e1e9
Include GRFs in bundle output.
2015-08-16 22:01:40 +01:00
Jonathan G Rennison
55af40c456
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
2015-08-16 17:34:04 +01:00
Jonathan G Rennison
6d5833dfe8
Merge branch 'house_placing' into jgrpp
2015-08-16 17:33:56 +01:00
Jonathan G Rennison
74e5d97fcb
Merge branch 'save_ext' into signal_tunnels_bridges-sx
2015-08-16 17:33:29 +01:00
Jonathan G Rennison
a5f00c1df5
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
2015-08-16 17:33:11 +01:00
Jonathan G Rennison
20f1f48983
Fix add/removing signals on bridges/tunnels not checking train occupancy.
...
Fix compiler warning.
2015-08-16 17:31:34 +01:00
Jonathan G Rennison
3e8611fca1
House placing: Fix uninitialised variable.
2015-08-16 17:05:49 +01:00
Jonathan G Rennison
880d455ea9
Merge branch 'progsig-sx' into jgrpp
2015-08-16 16:58:23 +01:00
Jonathan G Rennison
0693d3678a
Progsig: Fix some benign compiler warnings and whitespace issues.
2015-08-16 16:57:24 +01:00
Jonathan G Rennison
9283ae38df
Merge branch 'save_ext' into progsig-sx
2015-08-16 16:47:12 +01:00
Jonathan G Rennison
034279c0e8
Merge branch 'save_ext' into jgrpp
2015-08-16 14:36:26 +01:00
Jonathan G Rennison
a8cc81d054
Initialiser list fixes for legacy compilers.
2015-08-16 14:36:07 +01:00
Jonathan G Rennison
ef5ecdb2c7
Merge branch 'git_findversion_fix' into save_ext
2015-08-16 14:27:46 +01:00
Jonathan G Rennison
01482ba6b4
Fix findversion.sh using descendant instead of ancestor tags for the version string.
2015-08-16 14:25:53 +01:00
Jonathan G Rennison
0f88bcf380
Merge branch 'improved_breakdowns-sx' into jgrpp
2015-08-15 23:39:59 +01:00
Jonathan G Rennison
1ead315e42
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2015-08-15 23:39:45 +01:00
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.
2015-08-15 23:39:35 +01:00
Jonathan G Rennison
6d695a1426
Merge branch 'master' into improved_breakdowns
2015-08-15 23:34:48 +01:00
Jonathan G Rennison
9716026809
Merge branch 'jgrpp' into save_ext_spp
2015-08-15 15:24:21 +01:00
Jonathan G Rennison
bcdae2ff21
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-15 00:32:40 +01:00
Jonathan G Rennison
6088c7fc24
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-15 00:32:15 +01:00
Jonathan G Rennison
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
2015-08-15 00:28:14 +01:00
translators
8cfc1e9d23
(svn r27386) -Update from WebTranslator v3.0:
...
dutch - 3 changes by TheTycoonist
2015-08-14 17:45:16 +00:00
rubidium
3b8aabdd9e
(svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library
2015-08-13 18:13:24 +00:00
translators
70322bce59
(svn r27384) -Update from WebTranslator v3.0:
...
catalan - 35 changes by juanjo
2015-08-13 17:45:15 +00:00
rubidium
8f711aca53
(svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference
2015-08-12 20:50:10 +00: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
87c8bb74bd
Merge branch 'service_autorenew' into jgrpp
2015-08-11 21:42:30 +01:00
Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-08-11 21:41:58 +01:00
Jonathan G Rennison
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-08-11 21:41:48 +01:00
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
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.
2015-08-11 21:34:29 +01:00
Jonathan G Rennison
25bc8eb1e2
Save/load changes for timetable_separation_rate setting.
2015-08-11 21:24:56 +01:00
Jonathan G Rennison
adb3156951
Merge branch 'auto_timetables' into auto_timetables-sx
2015-08-11 21:24:05 +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
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.
2015-08-11 21:14:58 +01:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8
(svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode.
2015-08-10 20:04:31 +00:00
alberth
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
2015-08-10 10:04:14 +00:00
Jonathan G Rennison
6b0e63e054
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-09 23:59:58 +01:00
Jonathan G Rennison
15f3abf47d
Fix typo in save/load ext feature enum name for improved breakdown.
2015-08-09 23:58:24 +01:00
