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
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
translators
9ed6c2ebe1 (svn r27847) -Update from Eints: 
german: 19 changes by planetmaker
 2017-04-04 17:45:36 +00:00
translators
e37d54fb08 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
3084cac654 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-03-31 14:16:01 +01:00
Jonathan G Rennison
f3ed6765a5 Add Ctrl+Click to scroll to plan. 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
a3d21411e7 Add a 'Show All' button to plans GUI. 2017-03-31 14:15:36 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 2017-03-31 01:54:41 +01:00
Jonathan G Rennison
0772236986 Add a release slot at front of train slot action. 
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
 2017-03-31 01:10:26 +01:00
Jonathan G Rennison
7dbf99fa33 Add UI setting to hide adv tracerestrict features from GUI 
Hide wait at PBS and slot features.
 2017-03-30 23:32:37 +01:00
Jonathan G Rennison
927323dcb1 Add trace restrict slot membership conditional. 2017-03-30 21:53:30 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
translators
a39bdc14a0 (svn r27836) -Update from Eints: 
catalan: 2 changes by juanjo
 2017-03-30 17:45:36 +00:00
Jonathan G Rennison
7194e19380 Merge branch 'save_ext' into tracerestrict-sx 2017-03-29 19:52:59 +01:00
translators
4d3d43a70e (svn r27835) -Update from Eints: 
norwegian (bokmal): 37 changes by eirik174
 2017-03-29 17:45:37 +00:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00
peter1138
065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
translators
485c64fcbe (svn r27830) -Update from Eints: 
catalan: 6 changes by juanjo
italian: 1 change by lorenzodv
russian: 6 changes by Lone_Wolf
 2017-03-26 17:45:37 +00:00
translators
7659ec05af (svn r27828) -Update from Eints: 
croatian: 2 changes by VoyagerOne
italian: 6 changes by lorenzodv
english (us): 15 changes by Supercheese
latin: 15 changes by Supercheese
 2017-03-25 18:45:40 +00:00
HackaLittleBit
2549def764 Chunnel: Use separate container function for chunnel related conditions. 2017-03-24 22:40:38 +00:00
peter1138
0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 2017-03-24 18:55:16 +00:00
translators
6ceb8a0d28 (svn r27824) -Update from Eints: 
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
 2017-03-24 18:45:45 +00:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
translators
b54d144b28 (svn r27818) -Update from Eints: 
greek: 36 changes by kyrm
 2017-03-22 18:45:40 +00:00
translators
ccf94e8108 (svn r27817) -Update from Eints: 
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
 2017-03-21 18:45:37 +00:00
Jonathan G Rennison
f9f2d37a8e Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-03-20 19:14:48 +00:00
Jonathan G Rennison
fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 2017-03-20 19:06:09 +00:00
Jonathan G Rennison
0c42b384bc Merge branch 'save_ext' into adjacent_crossings 
# Conflicts:
#	src/train_cmd.cpp
 2017-03-20 18:48:12 +00:00
translators
712dbeda33 (svn r27815) -Update from Eints: 
russian: 7 changes by Lone_Wolf
 2017-03-20 18:45:36 +00:00
Jonathan G Rennison
6f07639c34 Merge branch 'master' into zoning 
# Conflicts:
#	src/station_cmd.cpp
 2017-03-20 18:38:10 +00:00
translators
bf30576255 (svn r27804) -Update from Eints: 
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
 2017-03-19 18:45:38 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
 2017-03-19 12:27:24 +00:00
alberth
17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
1f70279419 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 2017-03-18 20:48:54 +00:00
alberth
119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
b110c9c259 (svn r27800) -Change: Rename long aircraft string names of the preview window 2017-03-18 20:47:48 +00:00