Commit Graph

22233 Commits (0372bfcda7fe9eb9fed1fb690350e1b1d0efd5a2)
 

Author SHA1 Message Date
Jonathan G Rennison 0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison 33233e8575 Fix references to renamed variables.
Update comment on Order::UpdateJumpCounter.
9 years ago
Jonathan G Rennison ffdd845b1c Merge branch 'master' into more_cond_orders
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
9 years ago
Jonathan G Rennison ea5c33029b Fix various whitespace and style issues. 9 years ago
Jonathan G Rennison 218758fc86 Remove some of the Russian translations, as they are out-of-sync. 9 years ago
patch-import c757a97214 Import more conditional orders patch
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
Jonathan G Rennison 659b6b7337 PATX settings: Various changes to support legacy compilers. 9 years ago
frosch 8c389a2a96 (svn r27389) -Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough. 9 years ago
translators 8f36c49ffa (svn r27388) -Update from WebTranslator v3.0:
dutch - 4 changes by TheTycoonist
9 years ago
translators 284c9dd342 (svn r27387) -Update from WebTranslator v3.0:
dutch - 2 changes by TheTycoonist
9 years ago
Jonathan G Rennison a8cc81d054 Initialiser list fixes for legacy compilers. 9 years ago
Jonathan G Rennison ef5ecdb2c7 Merge branch 'git_findversion_fix' into save_ext 9 years ago
Jonathan G Rennison 01482ba6b4 Fix findversion.sh using descendant instead of ancestor tags for the version string. 9 years ago
translators 8cfc1e9d23 (svn r27386) -Update from WebTranslator v3.0:
dutch - 3 changes by TheTycoonist
9 years ago
rubidium 3b8aabdd9e (svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library 9 years ago
translators 70322bce59 (svn r27384) -Update from WebTranslator v3.0:
catalan - 35 changes by juanjo
9 years ago
rubidium 8f711aca53 (svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference 9 years ago
michi_cc f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
michi_cc 0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 9 years ago
frosch 63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 9 years ago
alberth 438d7a26cc (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 9 years ago
rubidium eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 9 years ago
rubidium cc5b8ea6cb (svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config 9 years ago
rubidium 2011c24502 (svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time) 9 years ago
rubidium 36f77b1aa7 (svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config 9 years ago
rubidium c3715a025d (svn r27373) -Codechange: make sdl detection and configuration use pkg-config 9 years ago
rubidium f05d71a9a6 (svn r27372) -Codechange: make allegro detection and configuration use pkg-config 9 years ago
rubidium f179a92007 (svn r27371) -Codechange: make freetype detection and configuration use pkg-config 9 years ago
rubidium 2aee2899e8 (svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine 9 years ago
rubidium a08d1a044f (svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib 9 years ago
rubidium 625bc2e0e7 (svn r27368) -Cleanup: undo the special case of OSX; it works fine without it 9 years ago
rubidium ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 9 years ago
Jonathan G Rennison 316b3a4acc Merge branch 'master' into save_ext 9 years ago
frosch 9f72662ecc (svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font. 9 years ago
frosch c9120cd714 (svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines. 9 years ago
translators a9200aa69a (svn r27364) -Update from WebTranslator v3.0:
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
9 years ago
alberth 894f69e1fd (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 9 years ago
alberth 48485a6a5a (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 9 years ago
rubidium bc199a4fe1 (svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier 9 years ago
rubidium 501ee2105a (svn r27360) -Feature: allow configuring pkg-config in one go for all libraries 9 years ago
Jonathan G Rennison e30d7c2164 Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame(). 9 years ago
translators f95759139b (svn r27359) -Update from WebTranslator v3.0:
swedish - 1 changes by planetmaker
9 years ago
Jonathan G Rennison 03b6c41c67 Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION. 9 years ago
Jonathan G Rennison eadeb51535 Merge branch 'master' into save_ext 9 years ago
Jonathan G Rennison 047395c663 Remove unnecessary and buggy field-packing in struct SlXvFeatureTest. 9 years ago
translators 163c30570b (svn r27358) -Update from WebTranslator v3.0:
catalan - 25 changes by juanjo
9 years ago
translators e6782df9ba (svn r27357) -Update from WebTranslator v3.0:
catalan - 181 changes by juanjo
9 years ago
Jonathan G Rennison b3e102fe52 Fix length mismatch in PATX loader. 9 years ago
Jonathan G Rennison 5d680d9154 Implement version setting in SlXvSetCurrentState
Call in ClearSaveLoadState
9 years ago