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

3750 Commits

Author SHA1 Message Date
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
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
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
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
f5c5783fac (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
e71afa0c10 (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
724dd44355 (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
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
f0db8a16d5 (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
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
translators
3ae6dab58b (svn r27554) -Update from Eints: 
korean: 1 change by Gimel3830
 2016-05-07 17:45:33 +00:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +01:00
Jonathan G Rennison
ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 2016-05-06 23:16:17 +01:00
Jonathan G Rennison
04b188bd7d Add client setting to show leftover ticks in timetable. 2016-05-06 19:47:46 +01:00
frosch
a3ffac0025 (svn r27552) -Feature: Mexican Spanish (Absay) 2016-04-30 08:28:40 +00:00
translators
806d97435e (svn r27551) -Update from Eints: 
ukrainian: 3 changes by odisseus
 2016-04-28 17:45:35 +00:00
translators
729a03ea67 (svn r27550) -Update from Eints: 
frisian: 7 changes by BAJansen
 2016-04-25 17:45:36 +00:00
translators
d23bcc13b1 (svn r27549) -Update from Eints: 
chinese (traditional): 1 change by ww9980
 2016-04-23 17:45:37 +00:00
translators
fa83b145c8 (svn r27548) -Update from Eints: 
korean: 1 change by telk5093
 2016-04-21 17:45:38 +00:00
Jonathan G Rennison
3da991bf9b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/rail_gui.cpp
 2016-04-19 22:48:33 +01:00
translators
c723ef85ff (svn r27540) -Update from Eints: 
hebrew: 40 changes by dnd_man
 2016-04-16 17:45:37 +00:00
translators
35aa952c36 (svn r27539) -Update from Eints: 
hebrew: 66 changes by dnd_man
 2016-04-14 17:45:35 +00:00
Jonathan G Rennison
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2016-04-13 21:14:47 +01:00
patch-import
01cf154f51 Import polyline rail tool patch v10b 
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
 2016-04-13 21:03:51 +01:00
translators
bff29d86b5 (svn r27538) -Update from Eints: 
hebrew: 18 changes by dnd_man
luxembourgish: 1 change by Phreeze
 2016-04-13 17:45:37 +00:00
translators
6ed602fab2 (svn r27537) -Update from Eints: 
korean: 2 changes by telk5093
 2016-04-09 17:45:38 +00:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
translators
0badab6d8e (svn r27536) -Update from Eints: 
belarusian: 1 change by KorneySan
malay: 1 change by rionix88
 2016-04-07 17:45:37 +00:00
translators
9a5db2063b (svn r27535) -Update from Eints: 
norwegian (bokmal): 16 changes by Leifbk
 2016-04-06 17:45:35 +00:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 2016-04-05 19:43:41 +01:00