dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,845 Commits 1 Branch 0 Tags
5aad0b51a38adba5b50275460a7f15c7d69593f5
Commit Graph

22845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp 
Conflicts:
	src/table/settings.ini
 2015-08-30 17:10:19 +01:00
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.
 2015-08-30 17:09:43 +01:00
Jonathan G Rennison
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp 
Conflicts:
	src/saveload/order_sl.cpp
 2015-08-26 23:26:18 +01:00
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
 2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-26 23:08:51 +01:00
Jonathan G Rennison
33233e8575 Fix references to renamed variables. 
Update comment on Order::UpdateJumpCounter.
 2015-08-26 23:07:02 +01:00
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
 2015-08-26 22:51:47 +01:00
Jonathan G Rennison
ea5c33029b Fix various whitespace and style issues. 2015-08-26 22:49:08 +01:00
Jonathan G Rennison
218758fc86 Remove some of the Russian translations, as they are out-of-sync. 2015-08-26 22:35:09 +01:00
patch-import
c757a97214 Import more conditional orders patch 
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
 2015-08-26 22:28:20 +01:00
Jonathan G Rennison
591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
 2015-08-26 19:09:38 +01:00
Jonathan G Rennison
805986811a Merge branch 'save_ext' into jgrpp 2015-08-26 19:08:18 +01:00
Jonathan G Rennison
bdf0216bf0 Avoid closing nested templates with >> for backwards compatibility. 2015-08-26 19:07:48 +01:00
Jonathan G Rennison
659b6b7337 PATX settings: Various changes to support legacy compilers. 2015-08-26 19:00:45 +01:00
Jonathan G Rennison
9c75a3c477 Enable building rivers in-game. 
Controlled by setting, default off.
 2015-08-25 23:44:28 +01:00
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