Commit Graph

3966 Commits

Author SHA1 Message Date
Jonathan G Rennison
82ec6d93dc Merge branch 'master' into jgrpp 2017-06-25 11:55:27 +01:00
Jonathan G Rennison
64d9cdd6f0 Merge branch 'tracerestrict-sx' into jgrpp 2017-06-20 19:19:39 +01:00
Jonathan G Rennison
b004c1998f Merge branch 'tracerestrict' into tracerestrict-sx 2017-06-20 19:19:21 +01:00
Jonathan G Rennison
7986367c1f Tracerestrict: Add program append management action. 2017-06-20 19:18:39 +01:00
translators
cfb75beef6 (svn r27882) -Update from Eints:
greek: 7 changes by kyrm
2017-06-19 17:45:37 +00:00
translators
3319616117 (svn r27879) -Update from Eints:
polish: 19 changes by lion
2017-06-11 17:45:38 +00:00
translators
eb294906ba (svn r27878) -Update from Eints:
vietnamese: 7 changes by nglekhoi
2017-06-10 17:45:37 +00:00
Jonathan G Rennison
965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-06-08 23:27:33 +01:00
translators
16f74c6a2f (svn r27877) -Update from Eints:
turkish: 28 changes by wakeup
2017-06-08 17:45:37 +00:00
Jonathan G Rennison
bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
2017-06-06 21:08:37 +01:00
Jonathan G Rennison
21696cc126 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
2017-06-06 21:06:47 +01:00
Jonathan G Rennison
350c2bb24f Make trains break down after collision with road vehicle. 2017-06-06 20:20:33 +01:00
Jonathan G Rennison
bcbe74f339 Adjust formatting of schedule dispatch summary.
Use different string if departure hasn't left yet.
2017-06-06 20:05:13 +01:00
Jonathan G Rennison
44fa555c6d Merge branch 'save_ext' into improved_breakdowns 2017-06-06 18:41:01 +01:00
Jonathan G Rennison
e15b3bb032 Fix typo in text string for maximum schedule slot delay. 2017-06-06 18:25:45 +01:00
innocenat
0b8f0e64ec Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
2017-05-30 01:37:08 +07:00
translators
b153db2568 (svn r27876) -Update from Eints:
swedish: 3 changes by Joel_A
2017-05-27 17:45:39 +00:00
translators
063c8509b7 (svn r27875) -Update from Eints:
chinese (simplified): 7 changes by chenwt0315
2017-05-23 17:45:37 +00:00
Jonathan G Rennison
10a91b291e Fix string references in pull request #18 2017-05-16 20:54:42 +01:00
translators
cc650ca82b (svn r27874) -Update from Eints:
luxembourgish: 6 changes by Phreeze
2017-05-16 17:45:37 +00:00
translators
8b1bf56b29 (svn r27873) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-05-15 17:45:36 +00:00
TELK
f81cdf0312 Erase original text 2017-05-14 14:12:25 +09:00
translators
8ab8a8f9b4 (svn r27872) -Update from Eints:
swedish: 19 changes by Joel_A
2017-05-13 17:45:37 +00:00
TELK
d3dc1c0945 ko-KR: Update Korean translation
Not fluently translated and seems that 7 strings are missed
2017-05-12 03:27:47 +09:00
translators
092ede70fd (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
2017-05-11 17:45:37 +00:00
Jonathan G Rennison
40b89902a5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/galician.txt
2017-05-10 19:40:39 +01:00
translators
4b7a30c44e (svn r27870) -Update from Eints:
hungarian: 38 changes by Brumi
2017-05-09 17:45:37 +00:00
translators
5d80417591 (svn r27869) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
2017-05-08 17:45:36 +00:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
translators
497aca8175 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-05-05 17:45:38 +00:00
translators
49ca5b0192 (svn r27861) -Update from Eints:
swedish: 49 changes by Joel_A
2017-04-29 17:45:37 +00:00
translators
9b4f7a6d4b (svn r27860) -Update from Eints:
scottish gaelic: 4 changes by GunChleoc
2017-04-28 17:45:37 +00:00
translators
24406b44c3 (svn r27857) -Update from Eints:
galician: 27 changes by permudo
2017-04-21 17:45:36 +00:00
translators
1327365d57 (svn r27856) -Update from Eints:
galician: 78 changes by permudo
2017-04-20 17:45:39 +00:00
translators
0f89d95459 (svn r27855) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-04-16 17:45:36 +00:00
Jonathan G Rennison
5a2fe49457 Add setting for transfer payment mode from source, minus transfers.
This is to reduce large negative payments for the final leg.
2017-04-12 19:52:50 +01:00
translators
747a950920 (svn r27854) -Update from Eints:
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
2017-04-12 17:45:37 +00:00
Jonathan G Rennison
bfb8f6f32e Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
2017-04-11 23:42:14 +01:00
translators
3e772b0732 (svn r27853) -Update from Eints:
spanish: 1 change by juanjo
2017-04-11 17:45:36 +00:00
Jonathan G Rennison
d1a287d73c Merge branch 'save_ext' into jgrpp 2017-04-11 18:42:11 +01:00
Jonathan G Rennison
c44141bad6 Add conditional to test slot occupancy state.
Bump tracerestrict version.
2017-04-10 19:00:52 +01:00
translators
6192780721 (svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
2017-04-10 17:45:37 +00:00
translators
830a4b63c9 (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
2017-04-09 17:45:38 +00:00
translators
c44b3db7a3 (svn r27849) -Update from Eints:
korean: 4 changes by telk5093
2017-04-08 17:45:39 +00:00
TELK
f2cd869a56 Merge & squash pull request #16
Korean: Add Chunnel translations and etc.
2017-04-07 20:25:42 +01:00
Jonathan G Rennison
ca93c90b56 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
2017-04-07 18:31:06 +01:00
translators
3b6fa4e33f (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
2017-04-06 17:45:37 +00:00
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
2017-04-05 19:00:24 +01:00
Jonathan G Rennison
4d21d6f81c Merge branch 'chunnel' into jgrpp 2017-04-04 23:30:04 +01:00
Jonathan G Rennison
80d56307c7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/group_gui.cpp
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/vehicle_sl.cpp
#	src/window.cpp
2017-04-04 19:22:56 +01:00