Jonathan G Rennison
|
bfb8f6f32e
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
|
7 years ago |
|
Jonathan G Rennison
|
d1a287d73c
|
Merge branch 'save_ext' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
c44141bad6
|
Add conditional to test slot occupancy state.
Bump tracerestrict version.
|
7 years ago |
translators
|
6192780721
|
(svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
|
7 years ago |
|
translators
|
830a4b63c9
|
(svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
|
7 years ago |
|
translators
|
c44b3db7a3
|
(svn r27849) -Update from Eints:
korean: 4 changes by telk5093
|
7 years ago |
TELK
|
f2cd869a56
|
Merge & squash pull request #16
Korean: Add Chunnel translations and etc.
|
7 years ago |
|
Jonathan G Rennison
|
ca93c90b56
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
|
7 years ago |
|
translators
|
3b6fa4e33f
|
(svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
|
7 years ago |
|
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
|
7 years ago |
|
Jonathan G Rennison
|
4d21d6f81c
|
Merge branch 'chunnel' into jgrpp
|
7 years ago |
|
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
|
7 years ago |
|
translators
|
9ed6c2ebe1
|
(svn r27847) -Update from Eints:
german: 19 changes by planetmaker
|
7 years ago |
|
translators
|
e37d54fb08
|
(svn r27842) -Update from Eints:
spanish: 9 changes by SilverSurferZzZ
|
7 years ago |
|
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
|
7 years ago |
|
Jonathan G Rennison
|
83091f55da
|
Merge branch 'vehicle_group_info' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
3084cac654
|
Merge branch 'enhanced_viewport_overlay' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
f3ed6765a5
|
Add Ctrl+Click to scroll to plan.
|
7 years ago |
|
Jonathan G Rennison
|
a3d21411e7
|
Add a 'Show All' button to plans GUI.
|
7 years ago |
HackaLittleBit
|
eddd635f00
|
Chunnel: Make error reporting consistent with tunnel length reporting at cursor.
Error reporting should be in tune with occurrence of events.
|
7 years ago |
|
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.
|
7 years ago |
|
Jonathan G Rennison
|
7dbf99fa33
|
Add UI setting to hide adv tracerestrict features from GUI
Hide wait at PBS and slot features.
|
7 years ago |
|
Jonathan G Rennison
|
927323dcb1
|
Add trace restrict slot membership conditional.
|
7 years ago |
|
Jonathan G Rennison
|
6417fb16c3
|
Initial implementation of trace restrict slots
|
7 years ago |
|
translators
|
a39bdc14a0
|
(svn r27836) -Update from Eints:
catalan: 2 changes by juanjo
|
7 years ago |
|
Jonathan G Rennison
|
7194e19380
|
Merge branch 'save_ext' into tracerestrict-sx
|
7 years ago |
|
translators
|
4d3d43a70e
|
(svn r27835) -Update from Eints:
norwegian (bokmal): 37 changes by eirik174
|
7 years ago |
|
Jonathan G Rennison
|
5a2d482c28
|
Tracerestrict: Add wait at PBS signal action.
|
7 years ago |
peter1138
|
065a0547e2
|
(svn r27832) -Fix: Missing or incorrect colour codes in translations
|
7 years ago |
|
translators
|
485c64fcbe
|
(svn r27830) -Update from Eints:
catalan: 6 changes by juanjo
italian: 1 change by lorenzodv
russian: 6 changes by Lone_Wolf
|
7 years ago |
|
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
|
7 years ago |
|
HackaLittleBit
|
2549def764
|
Chunnel: Use separate container function for chunnel related conditions.
|
7 years ago |
|
peter1138
|
0e68f9db70
|
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
|
7 years ago |
|
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
|
7 years ago |
|
peter1138
|
0887289e3d
|
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
|
7 years ago |
|
translators
|
b54d144b28
|
(svn r27818) -Update from Eints:
greek: 36 changes by kyrm
|
7 years ago |
|
translators
|
ccf94e8108
|
(svn r27817) -Update from Eints:
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
|
7 years ago |
|
Jonathan G Rennison
|
f9f2d37a8e
|
Merge branch 'master' into tracerestrict
# Conflicts:
# src/saveload/saveload.cpp
|
7 years ago |
|
Jonathan G Rennison
|
fc60857b66
|
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
0c42b384bc
|
Merge branch 'save_ext' into adjacent_crossings
# Conflicts:
# src/train_cmd.cpp
|
7 years ago |
|
translators
|
712dbeda33
|
(svn r27815) -Update from Eints:
russian: 7 changes by Lone_Wolf
|
7 years ago |
|
Jonathan G Rennison
|
6f07639c34
|
Merge branch 'master' into zoning
# Conflicts:
# src/station_cmd.cpp
|
7 years ago |
|
translators
|
bf30576255
|
(svn r27804) -Update from Eints:
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
|
7 years ago |
|
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
|
7 years ago |
alberth
|
17b46109ad
|
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
|
7 years ago |
|
alberth
|
1f70279419
|
(svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu)
|
7 years ago |
|
alberth
|
119965125d
|
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
|
7 years ago |
|
alberth
|
b110c9c259
|
(svn r27800) -Change: Rename long aircraft string names of the preview window
|
7 years ago |
|
alberth
|
fa5fd39c23
|
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
|
7 years ago |
|
alberth
|
7c3004c785
|
(svn r27798) -Change: Also remove obsolete string from the other languages
|
7 years ago |