Jonathan G Rennison
0f715f0a05
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
Jonathan G Rennison
6e3b3c04de
Enhanced viewports: Fix bug in previous fix for aqueducts in viewport map mode.
...
Tile type tests were being performed on the wrong tile index.
This fixes commit 5540374227
.
9 years ago
Jonathan G Rennison
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
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
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
8386cc3c1b
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
Jonathan G Rennison
5540374227
Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode.
...
Don't use water tile accessors on aqueduct bridge heads.
9 years ago
translators
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
9 years ago
Jonathan G Rennison
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
9 years ago
Jonathan G Rennison
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
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
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
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
Jonathan G Rennison
36d5b874da
Update project files
9 years ago
Jonathan G Rennison
c57ffc64bc
Settings update: add PATX chunk to store additional settings
...
in an unordered format which is tolerant of extra, missing or reordered
settings.
9 years ago
Jonathan G Rennison
bde094fe01
Initial implementation of SLXI chunk save/load
9 years ago
Jonathan G Rennison
a3980dc6ba
Move SlRead/SlWrite functions to saveload.h
...
Add SlGetBytesRead and SlGetBytesWritten functions.
9 years ago
Jonathan G Rennison
4508cfbf93
Add format-style versions of SlError and SlErrorCorrupt.
9 years ago
Jonathan G Rennison
17e8693e62
Initial stubs for extending the save/load version checking/upgrade code,
...
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
9 years ago
frosch
4eb6ce863a
(svn r27354) -Fix (r27343): Actually make it work. (rubidium)
9 years ago
translators
66418db43e
(svn r27352) -Update from WebTranslator v3.0:
...
catalan - 134 changes by juanjo
9 years ago
translators
18e7b67864
(svn r27347) -Update from WebTranslator v3.0:
...
slovenian - 15 changes by matej1245
9 years ago