Commit Graph

22741 Commits (258e591f7139eebb5d35b215d7554fdd87eb821b)
 

Author SHA1 Message Date
Jonathan G Rennison 258e591f71 Merge branch 'cpp-11' into save_ext 7 years ago
Jonathan G Rennison f3a0aace0c Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
translators 34cd504d65 (svn r27892) -Update from Eints:
finnish: 41 changes by USephiroth
7 years ago
translators bf3fd277c1 (svn r27891) -Update from Eints:
spanish: 29 changes by SilverSurferZzZ
7 years ago
translators de2ef2b543 (svn r27890) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
frosch b8456196ef (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 7 years ago
frosch f1f07b55f4 (svn r27888) -Fix: Member access coding style (adf88) 7 years ago
frosch 1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 7 years ago
frosch 2f7ac7c41f (svn r27886) -Fix [FS#6575-ish]: Do not modify argv[0]. 7 years ago
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. 7 years ago
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. 7 years ago
frosch 968f1151d1 (svn r27883) -Fix [FS#6576]: Console command parser passed invalid strings to the debug output, if command lines had many parameters. 7 years ago
translators cfb75beef6 (svn r27882) -Update from Eints:
greek: 7 changes by kyrm
7 years ago
translators 3319616117 (svn r27879) -Update from Eints:
polish: 19 changes by lion
7 years ago
translators eb294906ba (svn r27878) -Update from Eints:
vietnamese: 7 changes by nglekhoi
7 years ago
translators 16f74c6a2f (svn r27877) -Update from Eints:
turkish: 28 changes by wakeup
7 years ago
Jonathan G Rennison 843343fcf1 Merge branch 'master' into save_ext 7 years ago
translators b153db2568 (svn r27876) -Update from Eints:
swedish: 3 changes by Joel_A
7 years ago
translators 063c8509b7 (svn r27875) -Update from Eints:
chinese (simplified): 7 changes by chenwt0315
7 years ago
translators cc650ca82b (svn r27874) -Update from Eints:
luxembourgish: 6 changes by Phreeze
7 years ago
translators 8b1bf56b29 (svn r27873) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
translators 8ab8a8f9b4 (svn r27872) -Update from Eints:
swedish: 19 changes by Joel_A
7 years ago
translators 092ede70fd (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
8 years ago
translators 4b7a30c44e (svn r27870) -Update from Eints:
hungarian: 38 changes by Brumi
8 years ago
translators 5d80417591 (svn r27869) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
8 years ago
translators 497aca8175 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 49ca5b0192 (svn r27861) -Update from Eints:
swedish: 49 changes by Joel_A
8 years ago
translators 9b4f7a6d4b (svn r27860) -Update from Eints:
scottish gaelic: 4 changes by GunChleoc
8 years ago
peter1138 5932c84011 (svn r27859) -Revert (r27858): Committed too much :( 8 years ago
peter1138 e9e44105eb (svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo) 8 years ago
translators 24406b44c3 (svn r27857) -Update from Eints:
galician: 27 changes by permudo
8 years ago
translators 1327365d57 (svn r27856) -Update from Eints:
galician: 78 changes by permudo
8 years ago
translators 0f89d95459 (svn r27855) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 747a950920 (svn r27854) -Update from Eints:
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
8 years ago
translators 3e772b0732 (svn r27853) -Update from Eints:
spanish: 1 change by juanjo
8 years ago
Jonathan G Rennison 498b3db504 Merge branch 'master' into save_ext 8 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>
8 years ago
translators 6192780721 (svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
8 years ago
peter1138 02b6c533aa (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 8 years ago
translators 830a4b63c9 (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
8 years ago
translators c44b3db7a3 (svn r27849) -Update from Eints:
korean: 4 changes by telk5093
8 years ago
translators 3b6fa4e33f (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
8 years ago
translators 9ed6c2ebe1 (svn r27847) -Update from Eints:
german: 19 changes by planetmaker
8 years ago
peter1138 2e52de3406 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 8 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) 8 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. 8 years ago
peter1138 4b63778116 (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 8 years ago
translators e37d54fb08 (svn r27842) -Update from Eints:
spanish: 9 changes by SilverSurferZzZ
8 years ago
peter1138 7e915f8bc7 (svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries. 8 years ago