Jonathan G Rennison
f053082478
Viewport map: Use transport colour for road bridge/tunnels and aqueducts
...
In route mode
1 year ago
Jonathan G Rennison
d29cec53e0
Viewport map: Show bridges and tunnels in rail type colour in routes mode
...
See: #522
1 year ago
Jonathan G Rennison
9cb992ab14
Viewport map: Adjust vertical alignment of tunnels
1 year ago
Rubidium
63d9bb93b8
Codechange: migrate from C-style GetString to C++-style GetString
1 year ago
Peter Nelson
56085be9bd
Codechange: Move includes for common STL headers to stdafx.
1 year ago
Jonathan G Rennison
6d483cc5cc
Add toggle to show vehicle route overlay even when window is not focused
1 year ago
Jonathan G Rennison
4c2244cc21
Viewport: Refactor handling of vehicle route overlays
1 year ago
Jonathan G Rennison
c4571e86c8
Allow specifying any palette ID for tile highlight recolouring
1 year ago
PeterN
e97bf271dc
Codechange: Make SpriteType, CargoSortType, SourceType and ScriptType enum classes. ( #10663 )
...
This avoids a (soft) namespace conflict between the four ST_* enums.
1 year ago
PeterN
c1077212d7
Codechange: Use a shared_ptr for viewport overlay. ( #10586 )
1 year ago
Jonathan G Rennison
fd532fbd6f
Avoid integer overflow issues in measurement tooltip
...
For large distances
Use integer instead of floating point sqrt
1 year ago
Jonathan G Rennison
3e7a625e0e
Fix function locals shadowing parameters
1 year ago
Jonathan G Rennison
8d6e57799c
Fix various possible integer type conversion issues
1 year ago
Jonathan G Rennison
fef39b5797
Use backup/restore wrappers for various _cur_dpi changes
1 year ago
Jonathan G Rennison
483e3172af
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
1 year ago
Jonathan G Rennison
ff0e779680
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/order_backup.h
# src/settings_internal.h
# src/string.cpp
# src/viewport.cpp
1 year ago
rubidium42
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
Rubidium
f001e84e5e
Codechange: use RAII to automatically restore _cur_dpi after use
1 year ago
Rubidium
04d10b3d2d
Codechange: instead of global pointer to stack variable, just put variable in that global
...
Removes one indirection and a dangling pointer to a stack location
1 year ago
Rubidium
71b46db8d0
Cleanup: remove commented out code
1 year ago
Rubidium
fe2bcd2a58
Codechange: migrate size related functions to Map structure
1 year ago
Jonathan G Rennison
d97968a4f9
Rename ChildScreenSpritePositionMode enum values
2 years ago
Jonathan G Rennison
87056562e5
Change ChildScreenSpriteToDraw relative flag to an enum
...
Use separate modes for prior and upstream non-relative modes
2 years ago
Jonathan G Rennison
58d841486e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/os/windows/font_win32.cpp
# src/script/api/script_object.hpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
2 years ago
PeterN
c8cc61d889
Fix #10150 : Force FS_SMALL for small viewport signs. ( #10283 )
...
* Fix #10150 : Force FS_SMALL for small viewport signs.
This is a workaround for string widths being different with mixed
font-sizes.
* Fix: Flag small sign shadow as small text.
(This method of drawing shadows is hilarious and needs replacing, but
this is a quick fix.)
2 years ago
Peter Nelson
138198e971
Change: Separate ground sprite from foundation sprite offsets.
2 years ago
Peter Nelson
002fe67bef
Add: Optionally disable child sprites drawing relative to parent sprites offsets.
2 years ago
PeterN
f6e7e44169
Fix #10151 : Use smaller padding for viewport signs. ( #10272 )
...
Before variable-scaling, the padding was always 1x1 pixel. This was
changed to be scaled, except using the wrong dimension of 2x1 pixels
instead of 1x1 pixel.
2 years ago
Jonathan G Rennison
6d4474b84e
Merge tag '13.0-beta2' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2 years ago
Jonathan G Rennison
b52bb3ca44
Show viewport route overlay for shared order vehicle list windows
2 years ago
Jonathan G Rennison
6cf62af092
Change vehicle route overlay settings
...
Add a mode setting: off, all locations, station stops only
Change show vehicle route setting to on/off
Move settings to their own section in the GUI
Add an unset hotkey to switch the mode setting
2 years ago
Peter Nelson
890b2666d3
Change: Use scaled WidgetDimensions.
2 years ago
Jonathan G Rennison
449ed7aa51
Fix drawing of dirty block overlays
2 years ago
Jonathan G Rennison
2f4f862480
Viewport: Do bounding boxes and link graph/route overlays in threaded part
2 years ago
Jonathan G Rennison
5dcffe3142
Add variants of Gfx draw functions which take a DPI
2 years ago
Jonathan G Rennison
1eb18e5d24
Debug: Add a flag to disable viewport thread jobs
2 years ago
Jonathan G Rennison
7685c36f35
Implement partial parallelisation of non-map mode viewport rendering
2 years ago
Jonathan G Rennison
ee2763dcfd
Avoid using globals to control drawing of viewport sprites
2 years ago
Jonathan G Rennison
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
Jonathan G Rennison
8688840e24
Viewport route step markers are now variable size to match font/text
...
See: #410
2 years ago
Jonathan G Rennison
cd4a9fba68
Fix viewport map mode bridges/tunnels not appearing dotted at high zoom
2 years ago
Jonathan G Rennison
28724d651d
Tracerestrict: Add button to highlight all signals using program
2 years ago
Jonathan G Rennison
d6015194c1
Allow ctrl-clicking other company trains on own track to start/stop
...
See: #392
2 years ago
Jonathan G Rennison
6107aa9e5c
Render an overlay of the measurement tool area in viewport map mode
...
See: #388
2 years ago
Jonathan G Rennison
a9caeaa7f1
Fix viewport map scrolling box blend on emscripten
2 years ago
Jonathan G Rennison
b464c589af
Reduce blitter MoveTo calls when drawing viewport map scrolling box blend
2 years ago
Tyler Trahan
fbbc80f79e
Fix #9020 : Update station coverage highlight when adding/removing tiles
2 years ago
Jonathan G Rennison
d4f11eca42
Add NewGRF object properties to set viewport map mode/smallmap tile type
2 years ago
Jonathan G Rennison
d81cbc25b8
Add setting to allow hiding viewport labels of inidivudal waypoints
2 years ago
Jonathan G Rennison
dfc6e309d0
Fix ground/tree tile vegetation changes not updating map mode viewports
...
(In vegetation mode)
2 years ago
Michael Lutz
58cff7b081
Codechange: Un-bitstuff the remaining on-map commands.
3 years ago
Michael Lutz
7048e1522f
Codechange: Move flags in CommandProc in front of the command arguments.
3 years ago
Michael Lutz
33ca4f2b99
Codechange: Let the compile generate the master command table out of templated command traits.
...
This is using a non-intrusive type-traits like templated system, which
allows compile-time validation that the command table and the command
enum match up.
3 years ago
Jonathan G Rennison
324e90e5ac
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/lang/english.txt
# src/lang/greek.txt
# src/network/core/tcp_connect.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings/gui_settings.ini
# src/town_cmd.cpp
# src/widgets/rail_widget.h
3 years ago
Jonathan G Rennison
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
3 years ago
Jonathan G Rennison
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
3 years ago
Patric Stout
8ab267496b
Codechange: reference a string by its name, not with "another + 1" ( #9517 )
...
It is wrong anyway, as "TINY" normally is at -1. Just weird code.
3 years ago
Jonathan G Rennison
727e7543dc
Show unowned roads in viewport map owner mode
3 years ago
Jonathan G Rennison
9f56818ca7
Fix display of high freeform edges at north edges in viewport map mode
3 years ago
Jonathan G Rennison
24ad8759db
Viewport map: Improve handling of sloped tile rendering
3 years ago
Jonathan G Rennison
c4cb700738
Viewport map: Don't double draw north tile of bridge/tunnel
3 years ago
rubidium42
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
Jonathan G Rennison
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
Jonathan G Rennison
c0bb428e9e
Fix vehicle sprites not being updated when moving viewport
...
When move is instantaneous and old and new viewport rects do not overlap
3 years ago
glx22
5799402f7a
Codechange: Rename window related DeleteXXX to match new behaviour
3 years ago
rubidium42
2e136285e1
Codechange: move from C-string to std::string for DoCommand
3 years ago
rubidium42
b791ffc6de
Fix: do not hide parameter by local variable with the same name
3 years ago
Jonathan G Rennison
aa0c1ba2e0
Only update vehicle image when in the vicinity of a viewport
...
This reduces the performance impact of expensive NewGRF
graphics chains.
3 years ago
Jonathan G Rennison
6ea97d6068
Viewport: Cache viewport areas for use in MarkAllViewportsDirty
3 years ago
frosch
f96f113951
Codechange: use IterateFromBack/Front only if the order is important.
...
Use Iterate if the order does not matter.
3 years ago
frosch
22567a1f43
Codechange: use iterators instead of 'subranges' when iterating from a specific window.
...
Using iterators makes it easier to include or exclude the start window in the iteration.
3 years ago
glx22
dfe616bef4
Codechange: Replace window related FOR_ALL with range-based for loops
...
(cherry picked from commit 14e92bd8e2
)
3 years ago
glx22
14e92bd8e2
Codechange: Replace window related FOR_ALL with range-based for loops
3 years ago
Jonathan G Rennison
227041008f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/lang/russian.txt
# src/misc_gui.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_cmd.cpp
# src/window_gui.h
3 years ago
Jonathan G Rennison
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
Jonathan G Rennison
3ede756d23
Fix: Viewport drag tooltips not being removed when dragging over other windows
3 years ago
Jonathan G Rennison
e3d9cce3ae
Fix viewport drag tooltips not being removed when dragging over other windows
3 years ago
Jonathan G Rennison
7ad8b69a74
Fix old polyrail tooltips being left on screen
3 years ago
Jonathan G Rennison
aec2793487
Fix flickering of polyrail measurement tooltip
3 years ago
Jonathan G Rennison
42e57995dd
Improve visibility of slopes under trees in viewport map vegetation mode
...
Loosely based on tree slope brightness adjustment from
https://github.com/nielsmh/OpenTTD/tree/tree-slope-brightness
3 years ago
Jonathan G Rennison
2a0acd9d91
Fix viewport order lines with unconditional jump orders
3 years ago
Loïc Guilloux
f06c16fda0
Fix 81d335b081: Use non-pulsating red highlight for coverage ( #8622 )
...
(cherry picked from commit b927da73c1
)
3 years ago
Loïc Guilloux
b927da73c1
Fix 81d335b081: Use non-pulsating red highlight for coverage ( #8622 )
3 years ago
Jonathan G Rennison
e75e2b5bdc
Fix left mouse button scroll in viewport map mode
3 years ago
SamuXarick
a4035af337
Codechange: Apply coding style ( #8640 )
...
* Fix: Missing or needed spaces
* Codechange: Remove space
* Codechange: Remove space
* Codechange: More missing spaces
* Codechange: Missing spaces
* Codechange: Remove space
* Codechange: Remove space
3 years ago
Jonathan G Rennison
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
Jonathan G Rennison
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
Jonathan G Rennison
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
Matt Kimber
40d5fe1631
Fix eeb88e8: Trains reversed while paused do not correctly update sprite bounds ( #8540 )
3 years ago
Charles Pigott
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
Niels Martin Hansen
2d9fa81bd0
Feature: Plant clumps of trees in editor by dragging on the landscape
4 years ago
dP
e82333cf77
Feature #7962 : Improve rendering of large viewports
4 years ago
dP
5ca8a0bda9
Feature #7962 : Significantly improve sprite sorter performance
4 years ago
Michael Lutz
79240eab1e
Codechange: Make use of the improved C++17 emplace_back function.
4 years ago
Jonathan G Rennison
760a1f0163
Fix assert failure in MarkAllViewportMapsDirty
...
Assertion is incorrect
4 years ago
Jonathan G Rennison
0902243ab3
Allow changing the colour of plans
4 years ago
Jonathan G Rennison
ddaffef632
Add viewport map mode: routes
4 years ago
Jonathan G Rennison
2c4808e239
Viewport: Add debug flag to disable landscape cache
4 years ago
Jonathan G Rennison
7e68459ebd
Fix plans/route line viewport mark dirty not being wide enough
4 years ago
Jonathan G Rennison
b4ceb93406
Plans: Improve drawing performance of current plan line
4 years ago