Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
2015-08-05 21:54:11 +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
948b4e1d5e
Implement taking smallmap screenshots.
...
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
2015-08-04 01:26:32 +01:00
frosch
79380a566e
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
2015-02-22 14:10:44 +00:00
rubidium
4b8d6ee319
(svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111)
2014-09-27 11:17:54 +00:00
rubidium
11e9afdf5e
(svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111)
2014-09-21 18:07:54 +00:00
fonsinchen
ced1bfa60f
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
2014-01-19 09:26:56 +00:00
frosch
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
2013-05-26 19:23:42 +00:00
rubidium
2a6d21dc80
(svn r25262) -Feature: linkgraph overlay for smallmap
2013-05-19 14:36:35 +00:00
rubidium
06e93762bc
(svn r25021) -Codechange: make a lot of SmallMapWindow members protected (fonsinchen)
2013-02-17 20:55:26 +00:00
rubidium
5d6c2aac38
(svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen)
2013-02-17 20:51:55 +00:00
rubidium
b5a8bfa4b9
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
2013-02-17 20:38:35 +00:00
terkhen
dcb71c3770
(svn r21715) -Fix: Use the correct land colour in the owner legend.
2011-01-04 20:53:57 +00:00
terkhen
ad0b94ae44
(svn r19064) -Feature: Allow to select different land colours for the smallmap (reworked by Alberth).
2010-02-08 23:46:35 +00:00
terkhen
c39a4b22aa
(svn r19062) -Codechange: Move smallmap related functions to their own header.
2010-02-08 21:19:41 +00:00
