dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,082 Commits 1 Branch 0 Tags
06c458cb19e13e90b18f38aa8f9bfe08b395fa04
Commit Graph

7877 Commits

Author SHA1 Message Date
translators
bc432a0f43 (svn r27617) -Update from Eints: 
latvian: 6 changes by Parastais
 2016-07-17 17:45:36 +00:00
translators
18bbe02337 (svn r27615) -Update from Eints: 
spanish: 7 changes by SilverSurferZzZ
 2016-07-12 17:45:35 +00:00
translators
49fe24b03f (svn r27615) -Update from Eints: 
spanish: 7 changes by SilverSurferZzZ
 2016-07-12 17:45:35 +00:00
Jonathan G Rennison
d5ee260daf Update changed format code in translation. 2016-07-06 17:26:50 +01:00
Jonathan G Rennison
f0fee802a9 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
 2016-07-05 22:34:50 +01:00
Jonathan G Rennison
ed33a62bcd Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-05 22:19:34 +01:00
Jonathan G Rennison
0ab2abbc23 Add client setting to show train weight ratios in details header. 
Off by default.
 2016-07-05 21:54:43 +01:00
Jonathan G Rennison
8ec1b2200e Change tracerestrict weight ratio properties to use decimals, and the weight unit. 
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
 2016-07-05 21:20:06 +01:00
translators
8f2461cdfb (svn r27610) -Update from Eints: 
korean: 1 change by telk5093
 2016-07-02 17:45:35 +00:00
translators
14533f073b (svn r27610) -Update from Eints: 
korean: 1 change by telk5093
 2016-07-02 17:45:35 +00:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-30 20:15:27 +01:00
Jonathan G Rennison
f942de699c Add power/weight and max TE/weight ratio tracerestrict conditionals. 
Minor refactorings.
 2016-06-30 19:31:45 +01:00
Jonathan G Rennison
b5531975da Add train weight, power, and max TE tracerestrict conditionals. 
Minor refactorings.
 2016-06-29 22:08:05 +01:00
translators
932951982f (svn r27604) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2016-06-24 17:45:37 +00:00
translators
6fbc2863a8 (svn r27604) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2016-06-24 17:45:37 +00:00
translators
60d05aa27d (svn r27603) -Update from Eints: 
spanish: 12 changes by SilverSurferZzZ
 2016-06-19 17:45:36 +00:00
translators
8a68031ab0 (svn r27603) -Update from Eints: 
spanish: 12 changes by SilverSurferZzZ
 2016-06-19 17:45:36 +00:00
translators
3d54c33180 (svn r27601) -Update from Eints: 
spanish (mexican): 4 changes by Absay
 2016-06-13 17:45:37 +00:00
translators
403c393ef0 (svn r27601) -Update from Eints: 
spanish (mexican): 4 changes by Absay
 2016-06-13 17:45:37 +00:00
Jonathan G Rennison
6bcd6aec76 Merge branch 'master' into jgrpp 2016-06-12 21:25:38 +01:00
translators
1234b7d0f8 (svn r27599) -Update from Eints: 
persian: 2 changes by rkarimabadi
 2016-06-12 17:45:36 +00:00
translators
37e263e4fa (svn r27599) -Update from Eints: 
persian: 2 changes by rkarimabadi
 2016-06-12 17:45:36 +00:00
Jonathan G Rennison
09291a3b74 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-05-23 18:41:00 +01:00
translators
39d588fa60 (svn r27582) -Update from Eints: 
spanish (mexican): 18 changes by Absay
 2016-05-22 17:45:36 +00:00
translators
cfca6922e7 (svn r27582) -Update from Eints: 
spanish (mexican): 18 changes by Absay
 2016-05-22 17:45:36 +00:00
translators
f5c5783fac (svn r27569) -Update from Eints: 
spanish (mexican): 3 changes by Absay
 2016-05-20 17:45:35 +00:00
translators
46b7ac7b48 (svn r27569) -Update from Eints: 
spanish (mexican): 3 changes by Absay
 2016-05-20 17:45:35 +00:00
translators
dd2f369e9d (svn r27568) -Update from Eints: 
dutch: 1 change by habell
 2016-05-18 17:45:35 +00:00
translators
b996fdf656 (svn r27568) -Update from Eints: 
dutch: 1 change by habell
 2016-05-18 17:45:35 +00:00
translators
e71afa0c10 (svn r27567) -Update from Eints: 
finnish: 1 change by jpx_
 2016-05-17 17:45:37 +00:00
translators
dd6fb63598 (svn r27567) -Update from Eints: 
finnish: 1 change by jpx_
 2016-05-17 17:45:37 +00:00
translators
101a63c3f5 (svn r27566) -Update from Eints: 
spanish (mexican): 6 changes by Absay
 2016-05-14 17:45:37 +00:00
translators
ccd08c8c80 (svn r27566) -Update from Eints: 
spanish (mexican): 6 changes by Absay
 2016-05-14 17:45:37 +00:00
translators
724dd44355 (svn r27565) -Update from Eints: 
spanish (mexican): 13 changes by Absay
 2016-05-13 17:45:33 +00:00
translators
21646b7f48 (svn r27565) -Update from Eints: 
spanish (mexican): 13 changes by Absay
 2016-05-13 17:45:33 +00:00
Jonathan G Rennison
4c0423d6d8 Merge branch 'master' into jgrpp 2016-05-13 00:25:10 +01:00
Jonathan G Rennison
f6d374ade4 Merge branch 'house_placing' into jgrpp 
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-05-12 22:57:42 +01:00
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
frosch
bd71bcc616 (svn r27564) -Update: Ownname of es_MX. 2016-05-12 19:14:06 +00:00
frosch
36d91f8c02 (svn r27564) -Update: Ownname of es_MX. 2016-05-12 19:14:06 +00:00
translators
edfe26f2ee (svn r27563) -Update from Eints: 
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
 2016-05-12 17:45:36 +00:00
translators
7ccc54949e (svn r27563) -Update from Eints: 
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
 2016-05-12 17:45:36 +00:00
translators
f0db8a16d5 (svn r27556) -Update from Eints: 
spanish (mexican): 36 changes by Absay
 2016-05-11 17:45:36 +00:00
translators
463a16f1b0 (svn r27556) -Update from Eints: 
spanish (mexican): 36 changes by Absay
 2016-05-11 17:45:36 +00:00
Jonathan G Rennison
eac2f0720c Merge branch 'master' into jgrpp 2016-05-09 21:51:04 +01:00
translators
3d476cf432 (svn r27555) -Update from Eints: 
croatian: 3 changes by VoyagerOne
 2016-05-08 17:45:37 +00:00
translators
0cb97c31ae (svn r27555) -Update from Eints: 
croatian: 3 changes by VoyagerOne
 2016-05-08 17:45:37 +00:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00