pelya
|
3ef1c1baff
|
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time
Conflicts:
src/ai/ai_gui.cpp
src/build_vehicle_gui.cpp
src/cheat_gui.cpp
src/company_gui.cpp
src/depot_gui.cpp
src/dock_gui.cpp
src/error_gui.cpp
src/genworld_gui.cpp
src/misc_gui.cpp
src/network/network_content_gui.cpp
src/network/network_gui.cpp
src/newgrf_gui.cpp
src/news_gui.cpp
src/rail_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/settings_gui.cpp
src/settings_gui.h
src/signs_gui.cpp
src/station_gui.cpp
src/table/settings.ini
src/terraform_gui.cpp
src/toolbar_gui.cpp
src/toolbar_gui.h
src/vehicle_gui.cpp
src/video/sdl_v.cpp
src/viewport.cpp
src/widget.cpp
src/widgets/settings_widget.h
|
2016-03-27 22:33:11 +03:00 |
|
pelya
|
024daa1225
|
Smallmap legend can be hidden
|
2015-03-29 20:19:03 +03: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 |
|
Juanjo
|
f63ed5b6e7
|
Add min sizing on smallmap window.
|
2014-03-15 21:35:41 +02: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 |
|