8eb0609541
Fix industry chain window not always updating map-mode viewports
2 years ago
ce69d6e216
Fix: Scale smallmap legend 'blob' to fit text.
...
(cherry picked from commit 5434d63f91
3 years ago
f39b6f4ba3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/genworld_gui.cpp
# src/landscape.cpp
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/screenshot.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings.ini
# src/tile_type.h
# src/widgets/genworld_widget.h
3 years ago
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.
3 years ago
9909f9ab54
Fix smallmap not refreshing at all when paused
4 years ago
1867cebc4a
Make smallmap refresh period variable with map mode/zoom and pause state
4 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
3860a2ce2a
Codechange: Use override keyword for smallmap window.
5 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
5 years ago
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
5 years ago
0d0d55f81d
Scrolling/perf improvements to link graph overlays on viewport and smallmap
6 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
74e1fe130c
(svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible
7 years ago
322a053de7
(svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible
7 years ago
8cc6bddc24
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
Conflicts:
src/misc.cpp
9 years ago
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.
9 years ago
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
9 years ago
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
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
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
9 years ago
06d1d50884
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
9 years ago
79380a566e
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
9 years ago
4b8d6ee319
(svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111)
10 years ago
0176ef274f
(svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111)
10 years ago
11e9afdf5e
(svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111)
10 years ago
03b731f929
(svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111)
10 years ago
ced1bfa60f
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
11 years ago
b158c7d0fa
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
2a6d21dc80
(svn r25262) -Feature: linkgraph overlay for smallmap
11 years ago
163dfdd34a
(svn r25262) -Feature: linkgraph overlay for smallmap
11 years ago
06e93762bc
(svn r25021) -Codechange: make a lot of SmallMapWindow members protected (fonsinchen)
11 years ago
d0d4710f56
(svn r25021) -Codechange: make a lot of SmallMapWindow members protected (fonsinchen)
11 years ago
5d6c2aac38
(svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen)
11 years ago
52aeef1a79
(svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen)
11 years ago
b5a8bfa4b9
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
11 years ago
6b68956969
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
11 years ago
dcb71c3770
(svn r21715) -Fix: Use the correct land colour in the owner legend.
14 years ago
5268d03abd
(svn r21715) -Fix: Use the correct land colour in the owner legend.
14 years ago
ad0b94ae44
(svn r19064) -Feature: Allow to select different land colours for the smallmap (reworked by Alberth).
15 years ago
52312ea17f
(svn r19064) -Feature: Allow to select different land colours for the smallmap (reworked by Alberth).
15 years ago
c39a4b22aa
(svn r19062) -Codechange: Move smallmap related functions to their own header.
15 years ago
b9f06f3f29
(svn r19062) -Codechange: Move smallmap related functions to their own header.
15 years ago
Jonathan G Rennison
Peter Nelson
Patric Stout
S. D. Cloudt
adf88
patch-import
frosch
rubidium
fonsinchen
terkhen