Commit Graph

46 Commits

Author SHA1 Message Date
Jonathan G Rennison
46f5fb9f25 Sprite cache: Allow caching only required subset of sprite zoom levels
Enable for blitters based on 32bpp_optimized or SSE
2023-08-22 22:16:04 +01:00
Jonathan G Rennison
6091d7470c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
2023-05-28 10:20:52 +01:00
Jonathan G Rennison
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
2023-05-26 19:36:48 +01:00
Jonathan G Rennison
c4fc71339a Update orders window when renaming/removing dispatch schedule 2023-05-13 11:55:17 +01:00
Jonathan G Rennison
54221de0f5 Allow entering decimal day/minute timetable values 2023-05-10 20:06:19 +01:00
Jonathan G Rennison
8e2319ad68 Scheduled dispatch: Add button to adjust departure slots 2023-05-09 20:16:36 +01:00
Jonathan G Rennison
8f92668e22 Scheduled dispatch: Add menu item to append schedules from another vehicle 2023-05-07 20:06:47 +01:00
Jonathan G Rennison
62ecad1b63 Scheduled dispatch: Add menu item to duplicate current schedule 2023-05-07 14:02:37 +01:00
Jonathan G Rennison
4c2244cc21 Viewport: Refactor handling of vehicle route overlays 2023-05-06 19:14:39 +01:00
Jonathan G Rennison
211c1ba61d Allow naming scheduled dispatch schedules 2023-04-29 12:19:28 +01:00
Jonathan G Rennison
7c1d2bef0e Fix string parsing in scheduled dispatch window 2023-02-15 22:53:02 +00:00
Jonathan G Rennison
8d1563a1ed Various integer width type changes 2023-02-15 22:02:23 +00:00
Jonathan G Rennison
541beb386c Scheduled dispatch: Allow wrapping at midnight when bulk inserting slots
For 24 hour dispatch schedules

See: #467
2022-12-27 01:00:41 +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
e5a421b65a Merge branch 'master' into jgrpp
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
2022-03-04 18:17:44 +00:00
Jonathan G Rennison
a6190c9deb Fix crash in scheduled dispatch window with nearest depot dispatch order 2022-02-15 22:56:21 +00:00
Jonathan G Rennison
1d885c462f Fix incorrect string parameters for dispatch schedule assigned to depot
See: #368
2022-02-05 15:06:55 +00:00
Jonathan G Rennison
acaf20120f Fix text colour in scheduled dispatch management dropdown items
See: #369
2022-02-05 01:27:44 +00:00
Jonathan G Rennison
543433218c Ensure that timetable and scheduled dispatch windows redrawn as required
Reduce inefficient window and shared order list iteration
2022-01-15 00:21:31 +00:00
Jonathan G Rennison
fe522f193b Show confirmation window before clearing/removing dispatch schedule 2022-01-14 23:24:41 +00:00
Jonathan G Rennison
4f7f8c5b63 Show which order schedule assigned to in scheduled dispatch window 2022-01-13 23:04:38 +00:00
Jonathan G Rennison
ff3473fe6a Add support for multiple scheduled dispatch schedules per order list 2022-01-13 19:46:43 +00:00
Jonathan G Rennison
66ce6c5090 Scheduled dispatch: Add clear schedule GUI function
Add management dropdown box to window
2021-12-18 12:46:25 +00:00
Jonathan G Rennison
0aeafeaf3a Allow adding multiple scheduled dispatch departure slots at once 2021-11-28 02:25:42 +00:00
Jonathan G Rennison
b02b154218 Also show hours and minutes for schdispatch duration in minutes mode 2021-11-24 02:12:19 +00:00
Jonathan G Rennison
dd5d4c795b Fix entering schdispatch delay/duration when not in minutes mode 2021-11-24 02:10:22 +00:00
Jonathan G Rennison
2308345803 Improve labels of non-text scheduled dispatch date/time entry window 2021-11-23 23:40:13 +00:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings
See: #267
2021-06-11 22:54:27 +01:00
Jonathan G Rennison
2855c45c1b Fix #244: Scheduled dispatch buttons not disabled for other companies 2021-04-20 18:42:57 +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
3dd52c6198 Fix scrollbar functionality in schedule dispatch window 2020-11-15 09:37:11 +00: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
bca0187aaf Schedule dispatch: Warn about and ignore departure slots outside the duration 2020-02-09 23:17:19 +00:00
Jonathan G Rennison
ab1b8ab209 Scheduled dispatch: Add schedule end time to info line 2020-01-29 02:19:47 +00:00
Jonathan G Rennison
bffd52b74a Scheduled dispatch: Do not show required vehicles if conditional order present 2020-01-27 20:03:50 +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
innocenat
b93a4d6daa Fix input and display of hhmm times in scheduled dispatch GUI
When using high ticks/min and day length
2019-01-30 20:31:51 +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
c00d049057 Scheduled dispatch: Don't show invalid required vehicle estimate 2018-10-24 02:21:56 +01:00
innocenat
1b3969a014 Fix scheduled dispatch for multiplayer 2017-09-04 10:40:37 +07:00
innocenat
c4c891a6c1 Proper handling of invalid text input in scheduled dispatch 2017-06-08 13:09:17 +07:00
Jonathan G Rennison
bcbe74f339 Adjust formatting of schedule dispatch summary.
Use different string if departure hasn't left yet.
2017-06-06 20:05:13 +01:00
Jonathan G Rennison
27d9255f53 Fix trailing whitespace in schdispatch_gui.cpp 2017-06-06 18:27:00 +01:00
innocenat
0b8f0e64ec Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
2017-05-30 01:37:08 +07:00