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

3896 Commits

Author SHA1 Message Date
Jonathan G Rennison
7673436d3a Trace restrict: add train ownership conditional. 
Infra sharing whitespace fix.
 2015-12-15 20:30:20 +00:00
translators
ed7e09833e (svn r27471) -Update from WebTranslator v3.0: 
czech - 1 changes by djst
 2015-12-15 18:45:10 +00:00
translators
7338ed075f (svn r27470) -Update from WebTranslator v3.0: 
turkish - 69 changes by wakeup
 2015-12-11 18:45:09 +00:00
translators
696626a8e9 (svn r27467) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
turkish - 34 changes by wakeup
 2015-12-09 18:45:14 +00:00
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
 2015-12-09 01:03:37 +00:00
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.
 2015-12-09 01:01:37 +00:00
Jonathan G Rennison
14bf956cec Merge branch 'master' into jgrpp 2015-12-06 17:13:37 +00:00
translators
ae767d30a4 (svn r27466) -Update from WebTranslator v3.0: 
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
 2015-12-04 18:45:14 +00:00
translators
ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0: 
spanish - 5 changes by SilverSurferZzZ
 2015-12-03 18:45:08 +00:00
translators
1bf75b1abb (svn r27464) -Update from WebTranslator v3.0: 
spanish - 8 changes by SilverSurferZzZ
 2015-12-02 18:45:09 +00:00
translators
244144f0f6 (svn r27460) -Update from WebTranslator v3.0: 
spanish - 8 changes by SilverSurferZzZ
 2015-12-01 18:45:07 +00:00
Jonathan G Rennison
cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/vehicle.cpp
 2015-11-30 22:32:29 +00:00
Jonathan G Rennison
9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 2015-11-30 22:31:08 +00:00
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.
 2015-11-30 22:28:38 +00:00
Jonathan G Rennison
d05f67cf5a Merge branch 'master' into auto_timetables 2015-11-30 22:26:29 +00:00
translators
9808cfdf5e (svn r27459) -Update from WebTranslator v3.0: 
basque - 43 changes by Thadah
spanish - 3 changes by SilverSurferZzZ
 2015-11-30 18:45:13 +00:00
Jonathan G Rennison
af93385f41 Merge pull request #3 from auge8472/translate-de 
Translate de; improved breakdowns, adjacent level crossings
 2015-11-29 15:38:54 +00:00
Heiko August
d485f548f0 translate-de: add translation for improved breakdowns 2015-11-29 16:02:01 +01:00
Heiko August
e59a789fff translate-de: fix wrong template string 2015-11-29 14:27:46 +01:00
translators
bf61d7a797 (svn r27458) -Update from WebTranslator v3.0: 
basque - 20 changes by Thadah
 2015-11-26 18:45:10 +00:00
translators
786838d277 (svn r27457) -Update from WebTranslator v3.0: 
croatian - 1 changes by VoyagerOne
spanish - 2 changes by SilverSurferZzZ
 2015-11-25 18:45:12 +00:00
translators
e94c79227b (svn r27456) -Update from WebTranslator v3.0: 
korean - 7 changes by telk5093
spanish - 4 changes by SilverSurferZzZ
 2015-11-24 18:45:15 +00:00
Jonathan G Rennison
9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-24 01:06:51 +00:00
Jonathan G Rennison
1c3c413cfb Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-24 01:06:35 +00:00
translators
06fc9283f7 (svn r27455) -Update from WebTranslator v3.0: 
spanish - 4 changes by SilverSurferZzZ
 2015-11-23 18:45:08 +00:00
translators
ca93b0ef79 (svn r27454) -Update from WebTranslator v3.0: 
korean - 4 changes by telk5093
 2015-11-22 18:45:10 +00:00
translators
d8b8f033d5 (svn r27453) -Update from WebTranslator v3.0: 
italian - 1 changes by lorenzodv
 2015-11-21 18:45:08 +00:00
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).
 2015-11-20 23:55:02 +00:00
translators
17e6f42f03 (svn r27452) -Update from WebTranslator v3.0: 
russian - 1 changes by Lone_Wolf
 2015-11-20 18:45:10 +00:00
alberth
e1a00bc244 (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 2015-11-20 10:04:28 +00:00
Jonathan G Rennison
7ff6ad1e36 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-18 23:33:10 +00:00
Jonathan G Rennison
ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-18 23:33:00 +00:00
Jonathan G Rennison
6939bc7d87 Fix string type mismatch in German translation text. 2015-11-18 18:39:06 +00:00
translators
05812cd61b (svn r27449) -Update from WebTranslator v3.0: 
spanish - 2 changes by SilverSurferZzZ
 2015-11-18 17:45:09 +00:00
translators
420eb83065 (svn r27448) -Update from WebTranslator v3.0: 
spanish - 1 changes by SilverSurferZzZ
 2015-11-16 17:45:09 +00:00
translators
7db053813b (svn r27447) -Update from WebTranslator v3.0: 
spanish - 2 changes by SilverSurferZzZ
 2015-11-15 17:45:11 +00:00
translators
15b7e8faf1 (svn r27445) -Update from WebTranslator v3.0: 
spanish - 1 changes by SilverSurferZzZ
 2015-11-14 17:45:11 +00:00
translators
4dcda474fc (svn r27442) -Update from WebTranslator v3.0: 
spanish - 3 changes by SilverSurferZzZ
 2015-11-13 17:45:09 +00:00
translators
a55e6b6d5a (svn r27441) -Update from WebTranslator v3.0: 
spanish - 3 changes by SilverSurferZzZ
 2015-11-10 17:45:08 +00:00
translators
12229d80fe (svn r27440) -Update from WebTranslator v3.0: 
spanish - 2 changes by SilverSurferZzZ
 2015-11-09 17:45:07 +00:00
translators
7ce96b4d47 (svn r27439) -Update from WebTranslator v3.0: 
spanish - 7 changes by SilverSurferZzZ
 2015-11-08 17:45:08 +00:00
Heiko August
063c125f20 translate-de: add translation of setting textes for adjacent level crossings patch 2015-11-08 18:33:34 +01:00
translators
19e0cb8c50 (svn r27437) -Update from WebTranslator v3.0: 
spanish - 3 changes by SilverSurferZzZ
 2015-11-06 17:45:09 +00:00
translators
591c3e2c81 (svn r27436) -Update from WebTranslator v3.0: 
spanish - 1 changes by SilverSurferZzZ
 2015-11-05 17:45:08 +00:00
translators
246e85088d (svn r27435) -Update from WebTranslator v3.0: 
spanish - 5 changes by SilverSurferZzZ
 2015-11-04 17:45:08 +00:00
Jonathan G Rennison
072d428ed8 Merge remote-tracking branch 'auge8472/translate-de' into jgrpp 2015-11-01 21:59:15 +00:00
Jonathan G Rennison
44d545d220 Merge branch 'master' into departure-boards 2015-11-01 11:17:14 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
translators
85b19944f4 (svn r27416) -Update from WebTranslator v3.0: 
welsh - 2 changes by kazzie
 2015-10-29 17:45:08 +00:00
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
 2015-10-29 00:59:42 +00:00