dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,793 Commits 1 Branch 0 Tags
0ac92b823681bb9dfb53f7371db63db8c323d76c
Commit Graph

46793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
8b031f6c89 (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
56013d3b91 Mac OSX: Disable Mac assert header globally defining common names. 
See: https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/a9hZ094JK68
 2017-04-12 17:54:14 +01:00
Jonathan G Rennison
e6bbbfc58e Make company finance window max money value non-static. 2017-04-12 17:46:27 +01:00
Jonathan G Rennison
424e4691ce Show tracerestrict and/or progsig windows when ctrl-clicking signal. 2017-04-12 17:42:09 +01: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
Jonathan G Rennison
5ba7bf9da7 Fix company finance window being too small when first opened. 2017-04-11 18:59:47 +01:00
translators
3e772b0732 (svn r27853) -Update from Eints: 
spanish: 1 change by juanjo
 2017-04-11 17:45:36 +00:00
translators
aa241d073a (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
498b3db504 Merge branch 'master' into save_ext 2017-04-11 18:41:54 +01:00
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>
 2017-04-11 18:39:27 +01:00
Jonathan G Rennison
c44141bad6 Add conditional to test slot occupancy state. 
Bump tracerestrict version.
 2017-04-10 19:00:52 +01:00
Jonathan G Rennison
c94b7a6240 Add safeguard includes to tracerestrict files. 2017-04-10 18:57:46 +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
60ec55b483 (svn r27852) -Update from Eints: 
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
 2017-04-10 17:45:37 +00:00
peter1138
02b6c533aa (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 2017-04-09 21:58:07 +00:00
peter1138
0d13f793f2 (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 2017-04-09 21:58:07 +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
144604a29e (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
translators
be21185988 (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
translators
1644ef5f2d (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
65c65c1dcf Version: Committing version data for tag: jgrpp-0.18.0 2017-04-05 00:14:29 +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
Jonathan G Rennison
f50a9fef4f Add TRRS tracerestrict slot chunk to SLXI header. 2017-04-04 18:47:21 +01:00
translators
9ed6c2ebe1 (svn r27847) -Update from Eints: 
german: 19 changes by planetmaker
 2017-04-04 17:45:36 +00:00
translators
67b25f4acf (svn r27847) -Update from Eints: 
german: 19 changes by planetmaker
 2017-04-04 17:45:36 +00:00
peter1138
2e52de3406 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 2017-04-04 00:00:43 +00:00
peter1138
bf4499c643 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 2017-04-04 00:00:43 +00:00
Jonathan G Rennison
40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 2017-04-04 00:39:46 +01:00
peter1138
df5923d798 (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 2017-04-03 22:02:28 +00:00
peter1138
1eef97674c (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 2017-04-03 22:02:28 +00:00
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. 2017-04-03 21:53:51 +00:00
peter1138
9bc27c9a72 (svn r27844) -Change: (Yapf) Treat max cost exceeded separately from path too long condition, as destination should not be considered in the former case. 2017-04-03 21:53:51 +00:00
peter1138
4b63778116 (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 2017-04-03 21:37:01 +00:00
peter1138
39fa3c7cbd (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 2017-04-03 21:37:01 +00:00
translators
e37d54fb08 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
translators
9a7fa689a1 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
peter1138
7e915f8bc7 (svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries. 2017-04-02 17:36:53 +00:00
peter1138
27033a2231 (svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries. 2017-04-02 17:36:53 +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
86d1a00ba6 Merge branch 'master' into save_ext 2017-04-01 01:10:21 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
e4aacee627 Merge branch 'master' into vehicle_group_info 
# Conflicts:
#	src/group_gui.cpp
#	src/saveload/vehicle_sl.cpp
 2017-04-01 01:02:05 +01:00
peter1138
f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 2017-03-31 23:09:50 +00:00