Commit Graph

23877 Commits (5a2fe49457c9b9c47d472e21e59b4479754f9461)
 

Author SHA1 Message Date
Jonathan G Rennison 5a2fe49457 Add setting for transfer payment mode from source, minus transfers.
This is to reduce large negative payments for the final leg.
7 years ago
Jonathan G Rennison 56013d3b91 Mac OSX: Disable Mac assert header globally defining common names.
See: https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/a9hZ094JK68
7 years ago
Jonathan G Rennison e6bbbfc58e Make company finance window max money value non-static. 7 years ago
Jonathan G Rennison 424e4691ce Show tracerestrict and/or progsig windows when ctrl-clicking signal. 7 years ago
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 5ba7bf9da7 Fix company finance window being too small when first opened. 7 years ago
Jonathan G Rennison d1a287d73c Merge branch 'save_ext' into jgrpp 7 years ago
Jonathan G Rennison 498b3db504 Merge branch 'master' into save_ext 7 years ago
Jonathan G Rennison cb9ffe1bd9 Move std::string str_validate to separate header
This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
7 years ago
Jonathan G Rennison c44141bad6 Add conditional to test slot occupancy state.
Bump tracerestrict version.
7 years ago
Jonathan G Rennison c94b7a6240 Add safeguard includes to tracerestrict files. 7 years ago
translators 6192780721 (svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
7 years ago
peter1138 02b6c533aa (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 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 65c65c1dcf Version: Committing version data for tag: jgrpp-0.18.0 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
Jonathan G Rennison f50a9fef4f Add TRRS tracerestrict slot chunk to SLXI header. 7 years ago
translators 9ed6c2ebe1 (svn r27847) -Update from Eints:
german: 19 changes by planetmaker
7 years ago
peter1138 2e52de3406 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 7 years ago
Jonathan G Rennison 40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 7 years ago
peter1138 df5923d798 (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 7 years ago
peter1138 95acc016ba (svn r27844) -Change: (Yapf) Treat max cost exceeded separately from path too long condition, as destination should not be considered in the former case. 7 years ago
peter1138 4b63778116 (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 7 years ago
translators e37d54fb08 (svn r27842) -Update from Eints:
spanish: 9 changes by SilverSurferZzZ
7 years ago
peter1138 7e915f8bc7 (svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries. 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 86d1a00ba6 Merge branch 'master' into save_ext 7 years ago
Jonathan G Rennison 83091f55da Merge branch 'vehicle_group_info' into jgrpp 7 years ago
Jonathan G Rennison e4aacee627 Merge branch 'master' into vehicle_group_info
# Conflicts:
#	src/group_gui.cpp
#	src/saveload/vehicle_sl.cpp
7 years ago
peter1138 f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 7 years ago
Jonathan G Rennison 85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 7 years ago
Jonathan G Rennison ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 7 years ago
Jonathan G Rennison f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 7 years ago
Jonathan G Rennison 753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 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
Jonathan G Rennison b9e6ad1c6d Plans GUI: Fix various alignment issues.
Visibility button clicking, double mode, RTL mode, vertical alignment.
7 years ago
Jonathan G Rennison ac8b67ba9c Merge branch 'measurement_tool' into jgrpp 7 years ago
Jonathan G Rennison 0172f3acab Fix height above sea-level in measurement tool. 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 870216d27c Show manage slots in veh/group window drop down even when no vehicles. 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