dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,990 Commits 1 Branch 0 Tags
5dcbd9271b0356aea21d17389aad5a68ea36dd60
Commit Graph

53 Commits

Author SHA1 Message Date
Jonathan G Rennison
e7687da4cc Departure boards: Change long vehicle names to traditional if group also shown 2023-04-16 20:13:33 +01:00
Jonathan G Rennison
4f9aa70c11 Departure boards: Fix vehicle type icon in right-to-left languages 2023-04-16 19:42:53 +01:00
Jonathan G Rennison
b7e12189cf Departure boards: Adjust scaling and increase padding between columns 2023-04-16 19:35:43 +01:00
Jonathan G Rennison
404fb8bae2 Departure boards: Do not include hidden columns in minimum window width 2023-04-16 18:39:55 +01:00
Jonathan G Rennison
e8c1920e7f Departure board: Add support for dual via 2023-04-11 00:29:58 +01:00
Jonathan G Rennison
9c830aadcc Departure board: Refactor string handling 2023-04-11 00:29:58 +01:00
Jonathan G Rennison
339a8b14c5 Reset departure board scrolling when resizing window 2023-04-09 16:13:14 +01:00
Jonathan G Rennison
bb6d45e4dc Scroll departure boards at constant speed 
Even when paused or fast forwarding

See: #505
 2023-04-09 15:49:18 +01:00
Jonathan G Rennison
06e0f39aff Add text label and departure board via orders 2023-04-09 12:48:50 +01:00
Jonathan G Rennison
fef39b5797 Use backup/restore wrappers for various _cur_dpi changes 2023-02-15 22:02:23 +00:00
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
 2022-12-04 20:43:11 +00:00
Jonathan G Rennison
77dc6915a7 Departure boards: Don't show "no info requested" message when departure_show_both enabled 2022-12-04 12:10:10 +00:00
cakepie
d5e1954e3b Departure boards: ignore departure_show_both setting for waypoints 2022-12-04 14:17:51 +08:00
cakepie
5fa9e5efb1 Departure boards: Fix unintuitive "A"/"D" widget lowered states when disabled by departure_show_both 2022-12-03 10:03:16 +08:00
cakepie
b76359d485 Departure boards: Fix no entries shown if "show both" setting turned on while window already open with "Show Deps" false 2022-12-03 09:51:03 +08:00
cakepie
6b6a0adeb4 Departure boards: Fix swapped ship/acft tooltips, use dedicated strings with more appropriate wording instead of repurposing from WID_SV_* widgets' tooltips in station_gui 2022-12-03 00:47:06 +08:00
cakepie
821be47a60 Departure boards: cleanup: move misplaced comment 2022-12-03 00:12:09 +08:00
cakepie
87aa379aa9 Departure boards: Refactor widget toggling 2022-12-03 00:08:16 +08:00
cakepie
c0d3088817 Departure boards: Fix "show via" widget needs redrawn when changed as a side effect of "show deps" toggled 2022-12-02 23:26:16 +08:00
Jonathan G Rennison
a42557fed7 Departure boards: Fix windows not being refreshed when changing settings 2022-11-23 21:12:05 +00:00
Jonathan G Rennison
d48912aa15 Add setting to show full group hierarchy in group names 2022-06-28 17:41:09 +01:00
Jonathan G Rennison
de41a54f94 Departure boards: Fix excessive window width when using GUI zoom 2022-01-04 00:53:09 +00:00
Jonathan G Rennison
55b7e2178a Departure boards: Fix vehicle name column width with group vehicle names 2022-01-04 00:15:40 +00:00
Jonathan G Rennison
8bc15c10cd Fix station/waypoint vehicle tooltip showing incorrect ctrl-click text 
Split ctrl-click text from original tooltip strings

See: #36
 2021-11-27 12:59:46 +00:00
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
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
 2021-02-01 17:07:34 +00:00
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
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
651ac33858 Departure boards: Defer vehicle list refresh when invalidated 2020-07-19 12:47:51 +01:00
Jonathan G Rennison
f5e9805b10 Store time display settings both in savegame and client, add setting 2020-06-23 21:05:21 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Jonathan G Rennison
c5c24a3165 Departures: Increase margin between right-hand columns 2020-03-26 17:45:38 +00:00
Jonathan G Rennison
cb6a01cab3 Fix cases where departures board data was not invalidated 2020-03-09 09:22:38 +00:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
Jonathan G Rennison
ec0b5e0ed0 Improve performance of departures window 
See: #119
 2019-12-17 22:47:16 +00:00
Jonathan G Rennison
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
 2019-11-12 18:43:10 +00:00
Jonathan G Rennison
24458e9990 Add various missing override specifiers 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Jonathan G Rennison
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
 2019-03-27 18:12:04 +00:00
Jonathan G Rennison
3cb5bfe1a9 Fix departure GUI not updating when mode changed when paused 
Fix buttons not being re-drawn when ctrl-clicking transport type buttons
 2019-01-19 19:05:05 +00:00
Jonathan G Rennison
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
 2019-01-14 00:01:44 +00:00
Jonathan G Rennison
8e903b0a85 Merge branch 'departure-boards' into jgrpp 2018-04-17 16:35:29 +01:00
keldorkatarn
d2ca8914ac Departure Boards: Allow Ctrl-Click on vehicle type buttons to show type exclusively 
(cherry picked from commit a834d3cd452fe28e2c32fb953d41c0bd0ce20494)

See: #36
 2018-04-17 16:30:59 +01:00
Jonathan G Rennison
51e018c9a4 Merge branch 'departure-boards' into jgrpp 2017-09-22 22:24:57 +01:00
Jonathan G Rennison
07ca7cfb8c Add show passenger and show freight buttons to departure window 2017-09-22 22:24:44 +01:00
innocenat
87fdd7059a Partial fix for departure board with scheduled dispatch 
In case that the scheduled point is a station, the departure board cannot map arrival->departure correctly when showing both in same line is enabled.

For individial departure, the departure time and vehicle are not correspondence to each other. There will be train departing at that time, but might not be the vehicle shown in the board.
 2017-06-28 02:37:29 +07:00
Jonathan G Rennison
10ae23d3b9 Merge branch 'departure-boards' into jgrpp 
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
 2016-11-11 18:46:15 +00:00
Jonathan G Rennison
31b2a39d02 Merge branch 'save_ext' into departure-boards 
Adjust calls to GenerateVehicleSortList due to API change.
 2016-11-11 18:37:52 +00:00
Jonathan G Rennison
6bac8bbd48 Merge branch 'departure-boards' into jgrpp 2016-10-12 20:42:06 +01:00
Jonathan G Rennison
d226495d3b Fix main pane of departure boards window not being mouse-wheel scrollable. 2016-10-12 20:41:17 +01:00