dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,743 Commits 1 Branch 0 Tags
46050820c5cfc602bd8bc7475a366ce53d29d54c
Commit Graph

22743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
46050820c5 Fix missing template definition in company_settings. 
(cherry picked from commit 6e505ceab1)
 2017-08-20 01:52:07 +01:00
Jonathan G Rennison
6fcb156989 Add generic mechanism to cross-ref settings at load time. 
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.

(cherry picked from commit b5c453b21e)
 2017-08-20 01:44:10 +01:00
Jonathan G Rennison
258e591f71 Merge branch 'cpp-11' into save_ext 2017-08-15 18:44:36 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-08-15 18:44:17 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
translators
34cd504d65 (svn r27892) -Update from Eints: 
finnish: 41 changes by USephiroth
 2017-07-28 17:45:36 +00:00
translators
bf3fd277c1 (svn r27891) -Update from Eints: 
spanish: 29 changes by SilverSurferZzZ
 2017-07-25 17:45:37 +00:00
translators
de2ef2b543 (svn r27890) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-07-13 17:45:38 +00:00
frosch
b8456196ef (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +00:00
frosch
f1f07b55f4 (svn r27888) -Fix: Member access coding style (adf88) 2017-07-11 19:34:41 +00:00
frosch
1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 2017-07-11 19:34:21 +00:00
frosch
2f7ac7c41f (svn r27886) -Fix [FS#6575-ish]: Do not modify argv[0]. 2017-06-22 17:29:53 +00:00
frosch
dd3d824894 (svn r27885) -Cleanup (r27844): ESR_MAX_COST_EXCEEDED and ESR_PATH_TOO_LONG meant the same thing, but only one was used. Keep PATH_TOO_LONG since it has the better documentation. 2017-06-22 16:57:06 +00:00
frosch
5e7a50c8eb (svn r27884) -Fix: Console command parser failed when the command had many parameters, and also did not print any error messages about it. 2017-06-22 16:32:50 +00:00
frosch
968f1151d1 (svn r27883) -Fix [FS#6576]: Console command parser passed invalid strings to the debug output, if command lines had many parameters. 2017-06-22 16:31:04 +00:00
translators
cfb75beef6 (svn r27882) -Update from Eints: 
greek: 7 changes by kyrm
 2017-06-19 17:45:37 +00:00
translators
3319616117 (svn r27879) -Update from Eints: 
polish: 19 changes by lion
 2017-06-11 17:45:38 +00:00
translators
eb294906ba (svn r27878) -Update from Eints: 
vietnamese: 7 changes by nglekhoi
 2017-06-10 17:45:37 +00:00
translators
16f74c6a2f (svn r27877) -Update from Eints: 
turkish: 28 changes by wakeup
 2017-06-08 17:45:37 +00:00
Jonathan G Rennison
843343fcf1 Merge branch 'master' into save_ext 2017-06-06 18:40:04 +01:00
translators
b153db2568 (svn r27876) -Update from Eints: 
swedish: 3 changes by Joel_A
 2017-05-27 17:45:39 +00:00
translators
063c8509b7 (svn r27875) -Update from Eints: 
chinese (simplified): 7 changes by chenwt0315
 2017-05-23 17:45:37 +00:00
translators
cc650ca82b (svn r27874) -Update from Eints: 
luxembourgish: 6 changes by Phreeze
 2017-05-16 17:45:37 +00:00
translators
8b1bf56b29 (svn r27873) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-15 17:45:36 +00:00
translators
8ab8a8f9b4 (svn r27872) -Update from Eints: 
swedish: 19 changes by Joel_A
 2017-05-13 17:45:37 +00:00
translators
092ede70fd (svn r27871) -Update from Eints: 
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
 2017-05-11 17:45:37 +00:00
translators
4b7a30c44e (svn r27870) -Update from Eints: 
hungarian: 38 changes by Brumi
 2017-05-09 17:45:37 +00:00
translators
5d80417591 (svn r27869) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
 2017-05-08 17:45:36 +00:00
translators
497aca8175 (svn r27868) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-05 17:45:38 +00:00
translators
49ca5b0192 (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
peter1138
5932c84011 (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
translators
24406b44c3 (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
0f89d95459 (svn r27855) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-04-16 17:45:36 +00: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
3e772b0732 (svn r27853) -Update from Eints: 
spanish: 1 change by juanjo
 2017-04-11 17:45:36 +00: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
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
peter1138
02b6c533aa (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
c44b3db7a3 (svn r27849) -Update from Eints: 
korean: 4 changes by telk5093
 2017-04-08 17:45:39 +00: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
9ed6c2ebe1 (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
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
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
4b63778116 (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 2017-04-03 21:37:01 +00:00