Jonathan G Rennison
e257b23cba
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-25 18:26:52 +01:00
Jonathan G Rennison
6c32cca5b9
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-25 18:26:37 +01:00
Jonathan G Rennison
38aaf8a921
Fix compilation on legacy compilers.
2015-08-25 18:22:18 +01:00
Jonathan G Rennison
58780fb109
Merge branch 'everest_treeline-sx' into jgrpp
2015-08-22 01:29:53 +01:00
Jonathan G Rennison
3caa662c77
Timetable GUI: Scale dates/times by day length factor.
2015-08-22 01:21:55 +01:00
Jonathan G Rennison
010c290511
Departures: Scale dates in departures window by day length factor.
2015-08-22 00:36:28 +01:00
Jonathan G Rennison
803e8970c3
Departures: Fix major memory leak in MakeDepartureList.
2015-08-21 23:33:48 +01:00
Jonathan G Rennison
c6f38acbd6
Departures: Fix indentation/whitespace issues.
2015-08-21 23:06:52 +01:00
Jonathan G Rennison
64a6f5c0d4
Merge branch 'jgrpp' into save_ext_spp
2015-08-21 23:00:57 +01:00
Jonathan G Rennison
efb1ba3337
Add GUI settings and setting/help texts.
...
Move tree-related functions into their own GUI sub-category.
2015-08-21 21:17:18 +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
3b120c6cbd
Merge branch 'save_ext' into everest_treeline-sx
2015-08-21 18:16:30 +01:00
Jonathan G Rennison
efe85200f0
Import Everest treeline patch
2015-08-21 18:16:15 +01:00
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.
2015-08-20 20:47:45 +00:00
translators
8f36c49ffa
(svn r27388) -Update from WebTranslator v3.0:
...
dutch - 4 changes by TheTycoonist
2015-08-20 17:45:15 +00:00
Jonathan G Rennison
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
2015-08-20 00:39:26 +01:00
Jonathan G Rennison
6643d0a661
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-20 00:38:06 +01:00
Jonathan G Rennison
46817994bf
Include GRFs in bundle output.
2015-08-20 00:36:54 +01:00
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.
2015-08-19 21:56:22 +01:00
Jonathan G Rennison
88d45e5e2c
Clear rail ageing data on load.
2015-08-19 19:09:25 +01:00
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
