dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,723 Commits 1 Branch 0 Tags
eddd635f00bcc546014d30fe103e81996712a583
Commit Graph

3869 Commits

Author SHA1 Message Date
Jonathan G Rennison
531956bb4d Merge branch 'house_placing' into jgrpp 2015-09-21 22:17:37 +01:00
Jonathan G Rennison
0007e6fda2 Merge branch 'master' into house_placing 
Conflicts:
	src/terraform_gui.cpp
 2015-09-21 19:39:10 +01:00
translators
0d0b15875f (svn r27402) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-09-21 17:45:08 +00:00
translators
67b605337f (svn r27401) -Update from WebTranslator v3.0: 
frisian - 2 changes by BAJansen
norwegian_bokmal - 8 changes by hafting
welsh - 4 changes by kazzie
 2015-09-19 17:45:17 +00:00
translators
65f8b1c95e (svn r27398) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by xiangyigao
 2015-09-15 17:45:08 +00:00
Jonathan G Rennison
40b7d6d335 Import, rebase and make changes to build and refit patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=35805
 2015-09-12 22:05:00 +01:00
translators
a5355ec6c4 (svn r27396) -Update from WebTranslator v3.0: 
latin - 17 changes by Supercheese
 2015-09-12 17:45:16 +00:00
Jonathan G Rennison
8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/saveload.cpp
 2015-09-11 22:50:35 +01:00
Jonathan G Rennison
5d222e4d5e Merge branch 'extra_large_maps' into extra_large_maps-sx 
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
 2015-09-11 22:39:01 +01:00
patch-import
7d2b4bd3ea Import extra large maps patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
 2015-09-11 19:53:08 +01:00
Jonathan G Rennison
b67d139317 Merge branch 'house_placing' into jgrpp 2015-09-09 19:48:02 +01:00
Jonathan G Rennison
5a2ecfd548 Merge branch 'master' into house_placing 2015-09-09 19:43:03 +01:00
translators
081da61d05 (svn r27395) -Update from WebTranslator v3.0: 
frisian - 14 changes by BAJansen
 2015-09-09 17:45:14 +00:00
Jonathan G Rennison
4f17596ad9 Merge branch 'master' into jgrpp 2015-09-05 12:38:53 +01:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles. 
Default: off.
 2015-09-03 23:27:26 +01:00
translators
54eb340998 (svn r27394) -Update from WebTranslator v3.0: 
frisian - 25 changes by BAJansen
 2015-09-03 17:45:12 +00:00
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.
 2015-09-03 18:36:30 +01:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +01:00
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.
 2015-09-02 18:35:56 +01:00
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.
 2015-09-02 02:12:02 +01:00
translators
246df66229 (svn r27391) -Update from WebTranslator v3.0: 
english_US - 2 changes by Supercheese
 2015-08-31 17:45:13 +00:00
Jonathan G Rennison
ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 2015-08-31 10:22:39 +01:00
translators
ee8bee5e31 (svn r27390) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-08-30 17:45:17 +00:00
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
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
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
9c75a3c477 Enable building rivers in-game. 
Controlled by setting, default off.
 2015-08-25 23:44:28 +01:00
Jonathan G Rennison
58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 2015-08-22 01:29:53 +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
translators
8f36c49ffa (svn r27388) -Update from WebTranslator v3.0: 
dutch - 4 changes by TheTycoonist
 2015-08-20 17:45:15 +00: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
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
0f88bcf380 Merge branch 'improved_breakdowns-sx' into jgrpp 2015-08-15 23:39:59 +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
bcdae2ff21 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-15 00:32:40 +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
translators
70322bce59 (svn r27384) -Update from WebTranslator v3.0: 
catalan - 35 changes by juanjo
 2015-08-13 17:45:15 +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
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
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
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
 2015-08-09 23:45:21 +01:00