Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-08-11 21:41:58 +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
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
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
4a6036208a
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
2015-05-09 09:24:19 +00:00
frosch
d35670aa2a
(svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed.
2015-02-22 14:14:30 +00:00
frosch
7dee16a9b9
(svn r27159) -Codechange: Simplify mapping from smallmap to viewport coordinates by duplicating less code.
2015-02-22 14:12:34 +00: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
1149f7be46
(svn r27036) -Fix [FS#6148] (r26928): crash when changing smallmap colour when the smallmap window has not been opened yet
2014-10-23 10:50:34 +00:00
rubidium
367150ba34
(svn r26929) -Change: accounts for maximum height when filling the height legend of the smallmap
2014-09-27 14:49:37 +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
ae406cf52e
(svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder
2014-09-27 10:43:59 +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
peter1138
657c108d32
(svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button.
2014-09-20 10:23:38 +00:00
rubidium
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
2014-04-23 20:13:33 +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
fonsinchen
b4a889fcb4
(svn r26265) -Fix: Don't rebuild the link graph overlay cache twice in a row
2014-01-19 09:26:17 +00:00
fonsinchen
6becaddec2
(svn r26228) -Fix: missing variable initialization
2014-01-05 11:28:31 +00:00
rubidium
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
2014-01-02 22:41:58 +00:00
rubidium
519cb3e103
(svn r26121) -Codechange: add some asserts after dynamic casts to show they shouldn't return NULL ever
2013-11-26 13:21:25 +00:00
rubidium
e4b208c069
(svn r26061) -Fix: negative result of ftell wasn't handled correctly in some cases
2013-11-23 13:17:45 +00:00
frosch
0d5ab589fe
(svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000)
2013-10-27 15:09:41 +00:00
rubidium
2b2706009e
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
2013-06-01 07:44:53 +00:00
frosch
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
2013-05-26 19:30:07 +00:00
frosch
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
2013-05-26 19:25:01 +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
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
7fe2af5fd3
(svn r25019) -Fix: GCC doesn't seem to care if one does Class::Class::Function (thinks it is a function), whereas MSVC thinks it is the constructor
2013-02-17 20:48:52 +00:00
rubidium
b5a8bfa4b9
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
2013-02-17 20:38:35 +00:00
rubidium
bb9753924d
(svn r24958) -Fix [FS#5458]: refering to non-existent method
2013-02-02 19:52:56 +00:00
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
2012-12-23 21:09:09 +00:00
frosch
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
2012-11-11 16:10:43 +00:00
frosch
e83a41e9b5
(svn r24534) -Feature: Highlight industries on the smallmap when the mouse is over an entry in the legend.
2012-09-19 22:11:26 +00:00
frosch
942b40970f
(svn r24533) -Codechange: Move position determination on minimap legend to separate function.
2012-09-19 22:10:48 +00:00
rubidium
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
2012-04-25 20:50:13 +00:00
alberth
06597e684c
(svn r23704) -Doc: Doxygen comment fixes and additions.
2012-01-01 17:22:32 +00:00
truebrain
aa1a0053b0
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
2011-12-20 17:57:56 +00:00
truebrain
feddd40bcc
(svn r23546) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:14:11 +00:00
truebrain
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00
peter1138
b84174fd4d
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
2011-11-24 12:38:48 +00:00
frosch
856db2751a
(svn r23049) -Fix [FS#4810]: Use the same forest-check for the vegetation-map colour as for nearby station names.
2011-10-21 19:10:35 +00:00
frosch
43f7d6c0b7
(svn r22433) -Add/Fix: Add constants for the palette colours used in the smallmap and fix some windows palette indices.
2011-05-07 00:22:46 +00:00
frosch
a36ccb0e07
(svn r22432) -Codechange: Simplify smallmap colour constants using some more specialised macros.
2011-05-07 00:15:46 +00:00
frosch
7b251297c9
(svn r22429) -Add: some constants for specific palette colours used in the GUI.
2011-05-06 21:13:29 +00:00
michi_cc
b339fdae41
(svn r22428) -Codechange: Reduce code duplication in the smallmap legend.
2011-05-06 20:57:02 +00:00
