miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,102 Commits 14 Branches 28 Tags
6c08881b4db4f42163b782855ac49517aca2da62
Commit Graph

46 Commits

Author SHA1 Message Date
Sergii Pylypenko
7defb52028 Merge branch upstream/master 2021-11-28 03:16:36 +02:00
Sergii Pylypenko
41edadab81 Merge branch upstream/master 2021-11-28 01:52:06 +02:00
Peter Nelson
5434d63f91 Fix: Scale smallmap legend 'blob' to fit text. 2021-04-30 17:08:15 +01:00
Patric Stout
1a1049bc0d Change: rename setting "max_heightlevel" to "map_height_limit" 
This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.

Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.

Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value.
 2021-03-26 12:22:32 +01:00
pelya
dcacc5850f Legend hidden by default in smallmap window 2021-02-06 00:57:11 +02:00
pelya
455f481c8d Fixed minimap sizing 2020-03-23 00:27:59 +02:00
pelya
1764671302 Fixed compilation 2020-03-20 22:55:45 +02:00
pelya
798fbc3466 Merge branch 'origin/master' commit 'a499e9acdd385b57dd43caf88af3a6f7f53716ba' 2020-03-20 00:10:46 +02:00
Sergii Pylypenko
fea9bb1c24 Fixed minimap scrolling 2020-03-19 21:39:20 +02:00
Sergii Pylypenko
fe73e6d021 Removed debug 2020-03-19 21:39:20 +02:00
Sergii Pylypenko
c60ecc3118 Resizeable smallmap GUI, that will fit all FIRS industries 2020-03-19 21:39:20 +02:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Sergii Pylypenko
3ba683874b Merge remote-tracking branch 'origin/master' into HEAD 2019-04-23 18:16:24 +03:00
peter1138
3860a2ce2a Codechange: Use override keyword for smallmap window. 2019-03-24 17:38:42 +00:00
Peter Nelson
806e7d25dd Change: Use GUITimer class instead of bare int/uints. 2019-01-11 11:56:21 +00:00
Peter Nelson
2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 2019-01-11 11:56:21 +00:00
Sergii Pylypenko
66e3334f0e Merge upstream branch 1.8 2018-05-31 22:59:50 +03:00
adf88
74e1fe130c (svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible 2017-08-31 06:48:55 +00:00
Sergii Pylypenko
4928cc3022 Fixed legend in minimap 2016-04-08 21:45:30 +03:00
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
frosch
06d1d50884 (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
0176ef274f (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
rubidium
03b731f929 (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
fonsinchen
b158c7d0fa (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
frosch
56e4a8c4d6 (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
163dfdd34a (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
d0d4710f56 (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
52aeef1a79 (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
rubidium
6b68956969 (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
5268d03abd (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
52312ea17f (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
terkhen
b9f06f3f29 (svn r19062) -Codechange: Move smallmap related functions to their own header. 2010-02-08 21:19:41 +00:00