dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,001 Commits 1 Branch 0 Tags
43f847cebb71bd9403301e48475f222d40fe8ba3
Commit Graph

3992 Commits

Author SHA1 Message Date
Jonathan G Rennison
b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
 2015-10-25 21:50:14 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting. 
Move auto TT by default setting to PLYX chunk.
 2015-10-25 21:41:25 +00:00
Jonathan G Rennison
a380573c32 Merge branch 'save_ext' into auto_timetables-sx 2015-10-25 21:41:20 +00:00
Jonathan G Rennison
8001d86350 Merge branch 'save_ext' into order_occupancy-sx 2015-10-25 21:36:21 +00:00
Heiko August
fab9331a82 translate-de: add translation for additional infos in the group window 2015-10-25 19:21:31 +01:00
translators
e156f43848 (svn r27412) -Update from WebTranslator v3.0: 
vietnamese - 16 changes by myquartz
 2015-10-25 17:45:10 +00:00
Heiko August
17a25b08ad translate-de: add translations for train length and vehicle group in the detais window 2015-10-25 18:06:38 +01:00
Heiko August
3c3a139e22 translate-de: add translation of the zoning toolbar 2015-10-25 16:36:47 +01:00
Heiko August
0bb71475a2 translate-de: add missing non breaking space 2015-10-25 15:40:47 +01:00
translators
6155d6a3e0 (svn r27411) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-10-24 17:45:11 +00:00
Jonathan G Rennison
3d40ca2db9 Merge branch 'master' into jgrpp 2015-10-17 10:42:10 +01:00
translators
67da640e97 (svn r27410) -Update from WebTranslator v3.0: 
indonesian - 24 changes by UseYourIllusion
 2015-10-15 17:45:09 +00:00
Jonathan G Rennison
34ce418b63 Zoning: Add mode to show restricted signals. 2015-10-15 00:23:46 +01:00
translators
0608ab5f81 (svn r27409) -Update from WebTranslator v3.0: 
indonesian - 20 changes by UseYourIllusion
 2015-10-13 17:45:08 +00:00
translators
e9a338f9ef (svn r27408) -Update from WebTranslator v3.0: 
simplified_chinese - 9 changes by xiangyigao
 2015-10-09 17:45:08 +00:00
translators
440af97436 (svn r27407) -Update from WebTranslator v3.0: 
simplified_chinese - 6 changes by xiangyigao
 2015-10-05 17:45:09 +00:00
Jonathan G Rennison
6c5b86bd21 Merge branch 'progsig-sx' into jgrpp 2015-10-03 14:34:01 +01:00
Jonathan G Rennison
8760187899 progsig: Show target coordinates in signal state conditional. 2015-10-03 14:31:51 +01:00
Jonathan G Rennison
3089068e1a Merge branch 'progsig-sx' into jgrpp 2015-10-01 20:58:34 +01:00
Jonathan G Rennison
41a818cb7d Merge branch 'master' into progsig-rebase 2015-10-01 20:57:10 +01:00
translators
0df4b5142c (svn r27405) -Update from WebTranslator v3.0: 
latin - 2 changes by Supercheese
vietnamese - 18 changes by nglekhoi
 2015-09-27 17:45:15 +00:00
translators
334b2319ef (svn r27404) -Update from WebTranslator v3.0: 
arabic_egypt - 64 changes by abdumzn
 2015-09-26 17:45:17 +00:00
translators
12b35b301c (svn r27403) -Update from WebTranslator v3.0: 
polish - 7 changes by McZapkie
 2015-09-22 17:45:10 +00:00
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