dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,109 Commits 1 Branch 0 Tags
1defb8aafdbaf7940729aa49cea80e8cc67ad05c
Commit Graph

4030 Commits

Author SHA1 Message Date
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
translators
f8f2c9d3a5 (svn r27669) -Update from Eints: 
thai: 11 changes by angelix
 2016-10-19 17:45:35 +00:00
Jonathan G Rennison
13694c30cf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/clear_cmd.cpp
 2016-10-12 22:26:23 +01:00
Jonathan G Rennison
bebed03c7e Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/viewport.cpp
 2016-10-12 20:27:46 +01:00
Jonathan G Rennison
3975305f04 Limit number of vehicle route step markers for a single station to 10. 
If more than 10, draw an overflow marker instead.
Minor refactoring.
 2016-10-12 20:26:23 +01:00
translators
8c1bf8f16d (svn r27661) -Update from Eints: 
portuguese: 1 change by Samu
 2016-10-12 17:45:36 +00:00
translators
b080b86574 (svn r27660) -Update from Eints: 
portuguese: 7 changes by Samu
 2016-10-10 17:45:36 +00:00
translators
3ee07f37d8 (svn r27659) -Update from Eints: 
portuguese: 25 changes by Samu
 2016-10-09 17:45:39 +00:00
translators
169468a857 (svn r27658) -Update from Eints: 
danish: 1 change by Knogle
 2016-10-06 17:45:36 +00:00
Jonathan G Rennison
c83903ddb0 Merge branch 'master' into jgrpp 2016-09-26 23:15:22 +01:00
Jonathan G Rennison
f0bcec77fb Import patch for random town road reconstruction. 
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438

Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
 2016-09-19 23:07:09 +01:00
Jonathan G Rennison
c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
 2016-09-10 00:57:05 +01:00
Jonathan G Rennison
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
 2016-09-08 00:12:48 +01:00
translators
737897653a (svn r27655) -Update from Eints: 
romanian: 2 changes by kkmic
 2016-09-06 17:45:36 +00:00
Jonathan G Rennison
7178ef22e5 Adjust order line load/unload by cargo type strings. 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
c1c983ea16 Import cargo type orders patch 
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
761463d134 Merge branch 'template_train_replacement-sx' into jgrpp 
# Conflicts:
#	src/window.cpp
 2016-08-26 00:19:11 +01:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement 
Fix Template creation window vehicle drag cursor.
 2016-08-26 00:00:20 +01:00
translators
9d5ed2c469 (svn r27624) -Update from Eints: 
spanish (mexican): 24 changes by Absay
 2016-08-07 17:45:36 +00:00
Jonathan G Rennison
7b56097f50 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
 2016-07-24 10:16:55 +01:00
translators
aa140bb928 (svn r27618) -Update from Eints: 
latvian: 19 changes by Parastais
 2016-07-18 17:45:36 +00:00
translators
c6ac52e71a (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
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
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
60d05aa27d (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
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