Jonathan G Rennison
0ee812b5a9
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-18 23:31:35 +00:00
Jonathan G Rennison
f770dd1ed9
Fix out of bound buffer read for non-company tunnels in viewport map mode.
...
Caught by AddressSanitizer.
2015-11-18 00:04:56 +00:00
Jonathan G Rennison
16c5a0a812
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-12 20:14:23 +00:00
Jonathan G Rennison
5a0510e488
Fix dark/lighten colour mappings going to/from yellow flash cycle.
...
This is problematic for the green company in viewport map owner mode,
where it becomes flashing yellow for slopes and tunnels (if enabled).
2015-11-12 20:14:08 +00:00
Jonathan G Rennison
2a8b66b7bf
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-11 19:19:44 +00:00
Jonathan G Rennison
919057a5e6
Cache tunnel info in viewport map mode, to prevent render flicker.
...
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
2015-11-11 19:18:32 +00:00
Jonathan G Rennison
3788228d8f
Slightly lower displayed height of bridges in viewport map mode.
2015-11-11 01:02:24 +00:00
Jonathan G Rennison
33cc6916db
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-03 00:06:01 +00:00
Jonathan G Rennison
2503704d38
Fix displayed height for bridge/tunnels in viewport map mode.
2015-11-03 00:01:42 +00:00
Jonathan G Rennison
2c2f846e20
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-01 21:51:25 +00:00
Jonathan G Rennison
aa9f44eaec
Fix flicker/render errors of bridge/tunnels in viewport map mode.
...
Fix bridges not being rendered when the region to be repainted
did not intersect with either of the bridge ends.
Fix flicker due to non-deterministic ordering of the two bridge/tunnel
ends (if the tile heights of the two ends are different).
2015-11-01 21:51:10 +00:00
Jonathan G Rennison
ff588acb69
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-10-30 21:22:58 +00:00
Jonathan G Rennison
71a662ef84
Avoid closing nested templates with >> for backwards compatibility.
...
(cherry picked from commit bdf0216bf0
2015-10-30 21:22:37 +00:00
Jonathan G Rennison
129e14d817
Fix redrawing/clearing of vehicle route lines.
...
Fix new route lines not being (fully) added in a timely manner.
Fix old lines not being (fully) removed until a scroll/zoom.
Fix the screen invalidation algorithm assuming that the terrain is
perfectly flat at at near sea level. (Use of MarkTileDirtyByTile to
clear lines which do not follow tile height contours).
2015-10-30 21:05:33 +00:00
Jonathan G Rennison
0f715f0a05
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-09-18 22:13:14 +01:00
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
2015-09-18 22:12:58 +01:00
Jonathan G Rennison
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-08-11 21:41:48 +01:00
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8
(svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode.
2015-08-10 20:04:31 +00:00
alberth
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
2015-08-10 10:04:14 +00:00
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
2015-08-09 13:54:17 +00:00
rubidium
cc5b8ea6cb
(svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config
2015-08-09 12:43:52 +00:00
rubidium
2011c24502
(svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time)
2015-08-09 12:42:52 +00:00
rubidium
36f77b1aa7
(svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config
2015-08-09 12:42:21 +00:00
rubidium
c3715a025d
(svn r27373) -Codechange: make sdl detection and configuration use pkg-config
2015-08-09 12:41:54 +00:00
rubidium
f05d71a9a6
(svn r27372) -Codechange: make allegro detection and configuration use pkg-config
2015-08-09 12:41:35 +00:00
rubidium
f179a92007
(svn r27371) -Codechange: make freetype detection and configuration use pkg-config
2015-08-09 12:41:12 +00:00
rubidium
2aee2899e8
(svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine
2015-08-09 12:40:17 +00:00
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
2015-08-09 12:39:26 +00:00
rubidium
625bc2e0e7
(svn r27368) -Cleanup: undo the special case of OSX; it works fine without it
2015-08-09 12:37:20 +00:00
rubidium
ee700fd3b1
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
2015-08-09 12:33:27 +00:00
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.
2015-08-09 10:22:51 +00:00
frosch
c9120cd714
(svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines.
2015-08-09 10:21:06 +00:00
translators
a9200aa69a
(svn r27364) -Update from WebTranslator v3.0:
...
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
2015-08-08 17:45:27 +00:00
alberth
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
2015-08-08 13:19:38 +00:00
alberth
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
2015-08-08 10:06:24 +00:00
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
2015-08-08 08:54:49 +00:00
rubidium
501ee2105a
(svn r27360) -Feature: allow configuring pkg-config in one go for all libraries
2015-08-08 08:52:21 +00:00
Jonathan G Rennison
8386cc3c1b
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-08-07 21:30:50 +01:00
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.
2015-08-07 21:30:33 +01:00
translators
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
2015-08-07 17:45:12 +00:00
Jonathan G Rennison
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
2015-08-05 21:33:47 +01:00
Jonathan G Rennison
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-05 21:31:57 +01:00
Jonathan G Rennison
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
2015-08-05 21:31:17 +01:00
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
2015-08-05 21:25:13 +01:00
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
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
eadeb51535
Merge branch 'master' into save_ext
2015-08-03 00:09:59 +01:00
