88670a230f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
6 months ago
c18a1494b7
Codechange: Remove FONT_HEIGHT_... macros. ( #11481 )
...
These make it look like we're dealing with a constant, but actually each is a call to `GetCharacterHeight(...)`.
7 months ago
154df0bb7d
Fix some unused variable warnings when asserts are disabled
7 months ago
c76dc937e3
Fix tooltip string parameters, change function signatures to match upstream
7 months ago
c6411168d8
Cleanup: missing spaces before continuation * in some comments
7 months ago
37f84b7372
Codechange: replace x.size() != 0 with !x.empty()
8 months ago
b70f8020e6
Fix right-click viewport scroll after using change viewport buttons
...
See: #597
9 months ago
e5e1adad8a
Fix graphical issues with scrolling viewport overlays
9 months ago
290822d150
Update viewport positions in two stages
9 months ago
96ed5b5cad
Remove _vp_move_offs global
9 months ago
57e4929137
Fix viewport sign invisibility check
9 months ago
68c0fd63dd
Avoid window iterations when marking viewports dirty
9 months ago
52e4688851
Use Window iterate instead of from front/back when no order required
9 months ago
a18f3274b4
Rename close window functions to match upstream
9 months ago
ed1b842ad3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console.cpp
# src/console_func.h
# src/network/network_server.cpp
# src/os/unix/unix.cpp
# src/spritecache.cpp
# src/viewport.cpp
9 months ago
c8817d7f4e
Merge branch 'master' into jgrpp
...
# Conflicts:
# os/macosx/notarize.sh
# src/3rdparty/CMakeLists.txt
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/3rdparty/squirrel/squirrel/sqdebug.cpp
# src/3rdparty/squirrel/squirrel/sqvm.cpp
# src/console_cmds.cpp
# src/core/span_type.hpp
# src/crashlog.cpp
# src/currency.h
# src/date_gui.cpp
# src/driver.cpp
# src/fios.cpp
# src/genworld_gui.cpp
# src/hotkeys.cpp
# src/misc_gui.cpp
# src/music/os2_m.cpp
# src/network/core/os_abstraction.h
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_config.h
# src/newgrf_text.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/macosx/misc_osx.cpp
# src/os/os2/CMakeLists.txt
# src/os/os2/os2.cpp
# src/os/unix/CMakeLists.txt
# src/os/windows/font_win32.cpp
# src/os/windows/win32_main.cpp
# src/saveload/saveload.cpp
# src/script/api/script_text.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/stdafx.h
# src/strings.cpp
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/video/dedicated_v.cpp
# src/video/video_driver.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/waypoint_gui.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
# src/window_gui.h
9 months ago
46f5fb9f25
Sprite cache: Allow caching only required subset of sprite zoom levels
...
Enable for blitters based on 32bpp_optimized or SSE
10 months ago
0238a2b567
Codechange: use std::variant instead of using bitflags in the value ( #11191 )
10 months ago
4c88256183
De-duplicate string IDs used for viewport town labels
10 months ago
eaae0bb5e7
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
...
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
11 months ago
ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
11 months ago
8fea927ed1
Add setting for whether to shade height in viewport map mode
...
See: #550
11 months ago
05be624294
Remove gui.viewport_map_scan_surroundings setting, now always enabled
11 months ago
3b2934c479
Change: Make terraforming point selection sprite visible at >2x zoom out ( #11017 )
12 months ago
9a5df29648
Adjustments for PR #556
...
Setting text/condition, tooltip condition
12 months ago
321f01602a
Codechange: reduce passing around parameters, but formatting strings earlier
12 months ago
f48baa7d00
Codechange: move sign invisibility check out of loop
12 months ago
836541b41c
Codechange: use SetDParam and CopyOutDParam for tooltips
12 months ago
ac0c932ce7
Codechange: use SetDParam to set measurement tooltip parameters
12 months ago
61e9c3084f
Add picker tool to main toolbar help menu
...
See: #498
Supports:
* Rail types
* Road/tram types
* Objects
* Rail stations/waypoints
* Road stops/waypoints
Add unset hotkey
1 year ago
d7bf6b2c07
Feature: Highlight waypoint tiles when adjacent or distant joining
1 year ago
84b53213af
Codechange: Refactor viewport catchment overlay change handling
1 year ago
dc32b0533c
Viewport: Fix fixed vehicle route overlays not being marked dirty on remove
1 year ago
fd4d4d341d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
1 year ago
df5ca1d7fb
Highlight waypoint tiles when adjacent or distant joining
1 year ago
65159f4b22
Refactor viewport catchment overlay change handling
1 year ago
f053082478
Viewport map: Use transport colour for road bridge/tunnels and aqueducts
...
In route mode
1 year ago
d29cec53e0
Viewport map: Show bridges and tunnels in rail type colour in routes mode
...
See: #522
1 year ago
9cb992ab14
Viewport map: Adjust vertical alignment of tunnels
1 year ago
63d9bb93b8
Codechange: migrate from C-style GetString to C++-style GetString
1 year ago
56085be9bd
Codechange: Move includes for common STL headers to stdafx.
1 year ago
6d483cc5cc
Add toggle to show vehicle route overlay even when window is not focused
1 year ago
4c2244cc21
Viewport: Refactor handling of vehicle route overlays
1 year ago
c4571e86c8
Allow specifying any palette ID for tile highlight recolouring
1 year ago
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
c1077212d7
Codechange: Use a shared_ptr for viewport overlay. ( #10586 )
1 year ago
fd532fbd6f
Avoid integer overflow issues in measurement tooltip
...
For large distances
Use integer instead of floating point sqrt
1 year ago
3e7a625e0e
Fix function locals shadowing parameters
1 year ago
8d6e57799c
Fix various possible integer type conversion issues
1 year ago
fef39b5797
Use backup/restore wrappers for various _cur_dpi changes
1 year ago
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
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
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
f001e84e5e
Codechange: use RAII to automatically restore _cur_dpi after use
1 year ago
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
71b46db8d0
Cleanup: remove commented out code
1 year ago
fe2bcd2a58
Codechange: migrate size related functions to Map structure
1 year ago
d97968a4f9
Rename ChildScreenSpritePositionMode enum values
1 year ago
87056562e5
Change ChildScreenSpriteToDraw relative flag to an enum
...
Use separate modes for prior and upstream non-relative modes
1 year ago
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
1 year ago
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.)
1 year ago
138198e971
Change: Separate ground sprite from foundation sprite offsets.
1 year ago
002fe67bef
Add: Optionally disable child sprites drawing relative to parent sprites offsets.
1 year ago
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.
1 year ago
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
b52bb3ca44
Show viewport route overlay for shared order vehicle list windows
2 years ago
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
890b2666d3
Change: Use scaled WidgetDimensions.
2 years ago
449ed7aa51
Fix drawing of dirty block overlays
2 years ago
2f4f862480
Viewport: Do bounding boxes and link graph/route overlays in threaded part
2 years ago
5dcffe3142
Add variants of Gfx draw functions which take a DPI
2 years ago
1eb18e5d24
Debug: Add a flag to disable viewport thread jobs
2 years ago
7685c36f35
Implement partial parallelisation of non-map mode viewport rendering
2 years ago
ee2763dcfd
Avoid using globals to control drawing of viewport sprites
2 years ago
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
8688840e24
Viewport route step markers are now variable size to match font/text
...
See: #410
2 years ago
cd4a9fba68
Fix viewport map mode bridges/tunnels not appearing dotted at high zoom
2 years ago
28724d651d
Tracerestrict: Add button to highlight all signals using program
2 years ago
d6015194c1
Allow ctrl-clicking other company trains on own track to start/stop
...
See: #392
2 years ago
6107aa9e5c
Render an overlay of the measurement tool area in viewport map mode
...
See: #388
2 years ago
a9caeaa7f1
Fix viewport map scrolling box blend on emscripten
2 years ago
b464c589af
Reduce blitter MoveTo calls when drawing viewport map scrolling box blend
2 years ago
fbbc80f79e
Fix #9020 : Update station coverage highlight when adding/removing tiles
2 years ago
d4f11eca42
Add NewGRF object properties to set viewport map mode/smallmap tile type
2 years ago
d81cbc25b8
Add setting to allow hiding viewport labels of inidivudal waypoints
2 years ago
dfc6e309d0
Fix ground/tree tile vegetation changes not updating map mode viewports
...
(In vegetation mode)
2 years ago
58cff7b081
Codechange: Un-bitstuff the remaining on-map commands.
3 years ago
7048e1522f
Codechange: Move flags in CommandProc in front of the command arguments.
3 years ago
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
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
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
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
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
727e7543dc
Show unowned roads in viewport map owner mode
3 years ago
9f56818ca7
Fix display of high freeform edges at north edges in viewport map mode
3 years ago
24ad8759db
Viewport map: Improve handling of sloped tile rendering
3 years ago
c4cb700738
Viewport map: Don't double draw north tile of bridge/tunnel
3 years ago
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
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
Jonathan G Rennison
Peter Nelson
Rubidium
Patric Stout
Richard Wheeler
Tyler Trahan
Michael Lutz