dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,019 Commits 1 Branch 0 Tags
6bcc705c7c7337859fc39b694b7fb19772e91afc
Commit Graph

47019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
0cbb45ec63 Close child query input window when clicking buttons in timetable GUI. 
Fixes assertion failure if unrelated button is clicked between
opening and confirming query input window.
 2017-05-07 13:59:16 +01:00
translators
497aca8175 (svn r27868) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-05 17:45:38 +00:00
translators
661ad02c95 (svn r27868) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-05 17:45:38 +00:00
Jonathan G Rennison
d1dd5937eb Merge branch 'send_money_company' into jgrpp 2017-05-01 14:50:56 +01:00
Jonathan G Rennison
e43f0dad21 Fix crashes/issues with non-broadcast network chat. 2017-05-01 14:50:45 +01:00
translators
49ca5b0192 (svn r27861) -Update from Eints: 
swedish: 49 changes by Joel_A
 2017-04-29 17:45:37 +00:00
translators
f1b833dcb8 (svn r27861) -Update from Eints: 
swedish: 49 changes by Joel_A
 2017-04-29 17:45:37 +00:00
translators
9b4f7a6d4b (svn r27860) -Update from Eints: 
scottish gaelic: 4 changes by GunChleoc
 2017-04-28 17:45:37 +00:00
translators
7a6e51dbdc (svn r27860) -Update from Eints: 
scottish gaelic: 4 changes by GunChleoc
 2017-04-28 17:45:37 +00:00
Jonathan G Rennison
668702dc7e Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/misc_gui.cpp
 2017-04-26 20:26:15 +01:00
Jonathan G Rennison
d94e37d9d1 Fix viewport tooltips not being cleared when scrolling using the keyboard. 
Fix documentation typo.
 2017-04-26 20:25:50 +01:00
Jonathan G Rennison
4979309094 TBTR: Fix build and refit of template trains. 2017-04-26 19:09:57 +01:00
peter1138
5932c84011 (svn r27859) -Revert (r27858): Committed too much :( 2017-04-23 09:20:53 +00:00
peter1138
08fe8459c3 (svn r27859) -Revert (r27858): Committed too much :( 2017-04-23 09:20:53 +00:00
peter1138
e9e44105eb (svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo) 2017-04-23 09:19:32 +00:00
peter1138
c973f65acb (svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo) 2017-04-23 09:19:32 +00:00
translators
24406b44c3 (svn r27857) -Update from Eints: 
galician: 27 changes by permudo
 2017-04-21 17:45:36 +00:00
translators
3c3693583d (svn r27857) -Update from Eints: 
galician: 27 changes by permudo
 2017-04-21 17:45:36 +00:00
translators
1327365d57 (svn r27856) -Update from Eints: 
galician: 78 changes by permudo
 2017-04-20 17:45:39 +00:00
translators
ccf8b384af (svn r27856) -Update from Eints: 
galician: 78 changes by permudo
 2017-04-20 17:45:39 +00:00
translators
0f89d95459 (svn r27855) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-04-16 17:45:36 +00:00
translators
62eb2f1739 (svn r27855) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-04-16 17:45:36 +00:00
Jonathan G Rennison
ab22cfbc87 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-04-15 16:16:42 +01:00
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.
 2017-04-12 19:52:50 +01:00
Jonathan G Rennison
c41bf4b468 Viewport order lines refresh fix for re-displaying previous orders. 2017-04-12 19:19:07 +01:00
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
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