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

3966 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
213b0e7e3a Tracerestrict: Add a group membership conditional. 2016-04-05 18:40:16 +01:00
translators
05b5c945cc (svn r27530) -Update from Eints: 
catalan: 2 changes by juanjo
 2016-04-01 17:45:37 +00:00
translators
db8d95b1a0 (svn r27529) -Update from Eints: 
scottish gaelic: 3 changes by GunChleoc
frisian: 6 changes by BAJansen
spanish: 13 changes by SilverSurferZzZ
portuguese (brazilian): 1 change by Tucalipe
 2016-03-31 17:45:35 +00:00
translators
c5aee2ac52 (svn r27528) -Update from Eints: 
catalan: 233 changes by juanjo
portuguese (brazilian): 1 change by Tucalipe
 2016-03-30 17:45:37 +00:00
translators
692458d8f5 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators
927d1a9490 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
Jonathan G Rennison
636ecc9f23 Merge branch 'master' into jgrpp 2016-03-23 18:05:28 +00:00
translators
518eeac55f (svn r27525) -Update from Eints: 
latin: 18 changes by Supercheese
 2016-03-21 18:45:36 +00:00
translators
177c61477a (svn r27524) -Update from Eints: 
esperanto: 3 changes by LaPingvino
 2016-03-20 18:45:37 +00:00
Jonathan G Rennison
9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 2016-03-20 11:54:57 +00:00
translators
fe4d076dd8 (svn r27523) -Update from Eints: 
latvian: 1 change by Jancs
 2016-03-13 18:45:37 +00:00
Heiko August
aee3b77d99 translate-de: translation for lifetime profit strings 2016-03-13 12:36:36 +00:00
Heiko August
af036f3c52 translate-de: translation for ship collision avoidance patch 2016-03-13 12:36:32 +00:00
Heiko August
aabecf3998 translate-de: add translation for repair cost patch 2016-03-13 12:36:27 +00:00
Heiko August
40985ccb44 translate-de: add first strings of restricted signals patch 2016-03-13 12:36:05 +00:00
Jonathan G Rennison
ca9f6411cc Implement adding a vehicle list to a new group. 2016-03-08 19:27:03 +00:00
translators
20373af117 (svn r27522) -Update from Eints: 
slovenian: 72 changes by Necrolyte
 2016-03-08 18:45:36 +00:00
translators
3912258035 (svn r27521) -Update from Eints: 
malay: 5 changes by rionix88
 2016-03-05 18:45:38 +00:00
Jonathan G Rennison
c0cc72ad96 Implement change timetable waiting time for all stations. 
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
 2016-03-02 22:36:21 +00:00
Jonathan G Rennison
57cbecb0e0 Merge branch 'master' into jgrpp 2016-03-02 21:44:58 +00:00
frosch
a8b5756718 (svn r27516) -Update: Documentation 2016-03-01 19:41:31 +00:00
translators
8284c69a61 (svn r27515) -Update from Eints: 
polish: 1 change by lion
thai: 11 changes by ityellow
 2016-03-01 18:45:37 +00:00
translators
815fce8bd9 (svn r27514) -Update from Eints: 
turkish: 2 changes by wakeup
 2016-02-28 18:45:36 +00:00
translators
4a64ced9b5 (svn r27513) -Update from Eints: 
spanish: 5 changes by SilverSurferZzZ
 2016-02-26 18:45:36 +00:00
Jonathan G Rennison
7bc407e2f8 Merge branch 'infrastructure_sharing-sx' into jgrpp 
# Conflicts:
#	src/settings_type.h
#	src/table/settings.ini
 2016-02-25 22:31:36 +00:00
Jonathan G Rennison
1818a83e63 Add setting to control whether trains can crash with other companies'. 2016-02-25 22:08:27 +00:00
translators
d9da47f913 (svn r27512) -Update from Eints: 
spanish: 6 changes by SilverSurferZzZ
 2016-02-25 18:45:36 +00:00
translators
e7f0902eaf (svn r27511) -Update from Eints: 
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
 2016-02-24 18:45:38 +00:00
translators
9aaad3fa60 (svn r27510) -Update from Eints: 
frisian: 55 changes by BAJansen
 2016-02-19 18:45:35 +00:00
translators
561c4c2f02 (svn r27509) -Update from Eints: 
frisian: 60 changes by BAJansen
 2016-02-18 18:45:36 +00:00
Jonathan G Rennison
0779c7b7a9 Merge branch 'template_train_replacement-sx' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp
 2016-02-16 21:08:21 +00:00
Jonathan G Rennison
f3e01f4c6d Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-02-16 21:06:57 +00:00
Jonathan G Rennison
5850bcf699 TBTR: Fix crash and issues when using a no longer available engine type. 
Show error messages when cloning a vehicle to a template
or virtual vehicle fails.
Handle failed clones gracefully.
Bypass engine availability check when doing a template edit action.
Show correct error message if template replacement fails for
a non-money reason.
 2016-02-15 02:31:26 +00:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00
Jonathan G Rennison
671c12999e Merge branch 'template_train_replacement' into template_train_replacement-sx 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
 2016-02-14 17:40:39 +00:00
Jonathan G Rennison
a31e7ac87d Initial whitespace, formatting, file headers and NULL usage fixes. 2016-02-14 13:32:58 +00:00