Commit Graph

3643 Commits (9826c2481ebafb22ae88018d7900d852be6cee28)

Author SHA1 Message Date
translators ed7e09833e (svn r27471) -Update from WebTranslator v3.0:
czech - 1 changes by djst
9 years ago
translators 7338ed075f (svn r27470) -Update from WebTranslator v3.0:
turkish - 69 changes by wakeup
9 years ago
translators 696626a8e9 (svn r27467) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by Gavin
turkish - 34 changes by wakeup
9 years ago
Jonathan G Rennison 69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
Jonathan G Rennison 14bf956cec Merge branch 'master' into jgrpp 9 years ago
translators ae767d30a4 (svn r27466) -Update from WebTranslator v3.0:
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
9 years ago
translators ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0:
spanish - 5 changes by SilverSurferZzZ
9 years ago
translators 1bf75b1abb (svn r27464) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
9 years ago
translators 244144f0f6 (svn r27460) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/vehicle.cpp
9 years ago
Jonathan G Rennison 9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 9 years ago
Jonathan G Rennison d2b87485fb When clearing auto timetables, mark times as undefined rather than 0.
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
9 years ago
Jonathan G Rennison d05f67cf5a Merge branch 'master' into auto_timetables 9 years ago
translators 9808cfdf5e (svn r27459) -Update from WebTranslator v3.0:
basque - 43 changes by Thadah
spanish - 3 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison af93385f41 Merge pull request #3 from auge8472/translate-de
Translate de; improved breakdowns, adjacent level crossings
9 years ago
Heiko August d485f548f0 translate-de: add translation for improved breakdowns 9 years ago
Heiko August e59a789fff translate-de: fix wrong template string 9 years ago
translators bf61d7a797 (svn r27458) -Update from WebTranslator v3.0:
basque - 20 changes by Thadah
9 years ago
translators 786838d277 (svn r27457) -Update from WebTranslator v3.0:
croatian - 1 changes by VoyagerOne
spanish - 2 changes by SilverSurferZzZ
9 years ago
translators e94c79227b (svn r27456) -Update from WebTranslator v3.0:
korean - 7 changes by telk5093
spanish - 4 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 1c3c413cfb Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
translators 06fc9283f7 (svn r27455) -Update from WebTranslator v3.0:
spanish - 4 changes by SilverSurferZzZ
9 years ago
translators ca93b0ef79 (svn r27454) -Update from WebTranslator v3.0:
korean - 4 changes by telk5093
9 years ago
translators d8b8f033d5 (svn r27453) -Update from WebTranslator v3.0:
italian - 1 changes by lorenzodv
9 years ago
Jonathan G Rennison 6075dd22e2 Show small square if vehicle owner does not match list owner.
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
9 years ago
translators 17e6f42f03 (svn r27452) -Update from WebTranslator v3.0:
russian - 1 changes by Lone_Wolf
9 years ago
alberth e1a00bc244 (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 9 years ago
Jonathan G Rennison 7ff6ad1e36 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 6939bc7d87 Fix string type mismatch in German translation text. 9 years ago
translators 05812cd61b (svn r27449) -Update from WebTranslator v3.0:
spanish - 2 changes by SilverSurferZzZ
9 years ago
translators 420eb83065 (svn r27448) -Update from WebTranslator v3.0:
spanish - 1 changes by SilverSurferZzZ
9 years ago
translators 7db053813b (svn r27447) -Update from WebTranslator v3.0:
spanish - 2 changes by SilverSurferZzZ
9 years ago
translators 15b7e8faf1 (svn r27445) -Update from WebTranslator v3.0:
spanish - 1 changes by SilverSurferZzZ
9 years ago
translators 4dcda474fc (svn r27442) -Update from WebTranslator v3.0:
spanish - 3 changes by SilverSurferZzZ
9 years ago
translators a55e6b6d5a (svn r27441) -Update from WebTranslator v3.0:
spanish - 3 changes by SilverSurferZzZ
9 years ago
translators 12229d80fe (svn r27440) -Update from WebTranslator v3.0:
spanish - 2 changes by SilverSurferZzZ
9 years ago
translators 7ce96b4d47 (svn r27439) -Update from WebTranslator v3.0:
spanish - 7 changes by SilverSurferZzZ
9 years ago
Heiko August 063c125f20 translate-de: add translation of setting textes for adjacent level crossings patch 9 years ago
translators 19e0cb8c50 (svn r27437) -Update from WebTranslator v3.0:
spanish - 3 changes by SilverSurferZzZ
9 years ago
translators 591c3e2c81 (svn r27436) -Update from WebTranslator v3.0:
spanish - 1 changes by SilverSurferZzZ
9 years ago
translators 246e85088d (svn r27435) -Update from WebTranslator v3.0:
spanish - 5 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 072d428ed8 Merge remote-tracking branch 'auge8472/translate-de' into jgrpp 9 years ago
Jonathan G Rennison 8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
9 years ago
translators 85b19944f4 (svn r27416) -Update from WebTranslator v3.0:
welsh - 2 changes by kazzie
9 years ago
Jonathan G Rennison 2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 7bcd090a0f Add reverse at waypoint orders.
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
translators 3af9438fb5 (svn r27415) -Update from WebTranslator v3.0:
spanish - 6 changes by SilverSurferZzZ
9 years ago
translators 2d684b8e76 (svn r27414) -Update from WebTranslator v3.0:
spanish - 11 changes by SilverSurferZzZ
9 years ago
translators 3c269df00d (svn r27413) -Update from WebTranslator v3.0:
spanish - 12 changes by SilverSurferZzZ
9 years ago
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
9 years ago
Jonathan G Rennison 26d32269a3 Make auto TT separation rate a company setting.
Move auto TT by default setting to PLYX chunk.
9 years ago
Jonathan G Rennison a380573c32 Merge branch 'save_ext' into auto_timetables-sx 9 years ago
Jonathan G Rennison 8001d86350 Merge branch 'save_ext' into order_occupancy-sx 9 years ago
Heiko August fab9331a82 translate-de: add translation for additional infos in the group window 9 years ago
translators e156f43848 (svn r27412) -Update from WebTranslator v3.0:
vietnamese - 16 changes by myquartz
9 years ago
Heiko August 17a25b08ad translate-de: add translations for train length and vehicle group in the detais window 9 years ago
Heiko August 3c3a139e22 translate-de: add translation of the zoning toolbar 9 years ago
Heiko August 0bb71475a2 translate-de: add missing non breaking space 9 years ago
translators 6155d6a3e0 (svn r27411) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
Jonathan G Rennison 3d40ca2db9 Merge branch 'master' into jgrpp 9 years ago
translators 67da640e97 (svn r27410) -Update from WebTranslator v3.0:
indonesian - 24 changes by UseYourIllusion
9 years ago
Jonathan G Rennison 34ce418b63 Zoning: Add mode to show restricted signals. 9 years ago
translators 0608ab5f81 (svn r27409) -Update from WebTranslator v3.0:
indonesian - 20 changes by UseYourIllusion
9 years ago
translators e9a338f9ef (svn r27408) -Update from WebTranslator v3.0:
simplified_chinese - 9 changes by xiangyigao
9 years ago
translators 440af97436 (svn r27407) -Update from WebTranslator v3.0:
simplified_chinese - 6 changes by xiangyigao
9 years ago
Jonathan G Rennison 6c5b86bd21 Merge branch 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison 8760187899 progsig: Show target coordinates in signal state conditional. 9 years ago
Jonathan G Rennison 3089068e1a Merge branch 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison 41a818cb7d Merge branch 'master' into progsig-rebase 9 years ago
translators 0df4b5142c (svn r27405) -Update from WebTranslator v3.0:
latin - 2 changes by Supercheese
vietnamese - 18 changes by nglekhoi
9 years ago
translators 334b2319ef (svn r27404) -Update from WebTranslator v3.0:
arabic_egypt - 64 changes by abdumzn
9 years ago
translators 12b35b301c (svn r27403) -Update from WebTranslator v3.0:
polish - 7 changes by McZapkie
9 years ago
Jonathan G Rennison 531956bb4d Merge branch 'house_placing' into jgrpp 9 years ago
Jonathan G Rennison 0007e6fda2 Merge branch 'master' into house_placing
Conflicts:
	src/terraform_gui.cpp
9 years ago
translators 0d0b15875f (svn r27402) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
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
9 years ago
translators 65f8b1c95e (svn r27398) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by xiangyigao
9 years ago
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
9 years ago
translators a5355ec6c4 (svn r27396) -Update from WebTranslator v3.0:
latin - 17 changes by Supercheese
9 years ago
Jonathan G Rennison 8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp
Conflicts:
	src/saveload/saveload.cpp
9 years ago
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
9 years ago
patch-import 7d2b4bd3ea Import extra large maps patch.
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
9 years ago
Jonathan G Rennison b67d139317 Merge branch 'house_placing' into jgrpp 9 years ago
Jonathan G Rennison 5a2ecfd548 Merge branch 'master' into house_placing 9 years ago
translators 081da61d05 (svn r27395) -Update from WebTranslator v3.0:
frisian - 14 changes by BAJansen
9 years ago
Jonathan G Rennison 4f17596ad9 Merge branch 'master' into jgrpp 9 years ago
Jonathan G Rennison e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison 42370dc28d Add company setting to auto-enable auto timetables for new vehicles.
Default: off.
9 years ago
translators 54eb340998 (svn r27394) -Update from WebTranslator v3.0:
frisian - 25 changes by BAJansen
9 years ago
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.
9 years ago
Jonathan G Rennison 3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
9 years ago
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.
9 years ago
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.
9 years ago
translators 246df66229 (svn r27391) -Update from WebTranslator v3.0:
english_US - 2 changes by Supercheese
9 years ago
Jonathan G Rennison ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 9 years ago
translators ee8bee5e31 (svn r27390) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
Jonathan G Rennison 5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp
Conflicts:
	src/table/settings.ini
9 years ago