dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,920 Commits 1 Branch 0 Tags
16259e9619d0e7307a2df8298099ca64ffa80f25
Commit Graph

31 Commits

Author SHA1 Message Date
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
c40f4e0abc Handle predictable conditional orders in departure boards 2022-01-15 15:57:33 +00:00
Jonathan G Rennison
1ac6326306 Departure boards: Fix departure slot cache with multiple schedules 2022-01-15 12:25:09 +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
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
Jonathan G Rennison
764af07a33 Fix departure boards not handling unconditional order jumps 2021-02-10 22:36:35 +00:00
Jonathan G Rennison
c0e267973f Departure board: Skip vehicles with no orders 2020-07-19 12:21:34 +01:00
Jonathan G Rennison
c7f6a711b3 Departures board: Fix handling of via orders for arrivals 2020-07-07 17:41:34 +01:00
Jonathan G Rennison
a16d0b71b3 Fix handling of vehicles with no orders in departure board 
See: #162
 2020-06-28 11:53:58 +01:00
Jonathan G Rennison
be3f03358f Departure boards: Fix handling of waiting orders 
See: #144
 2020-04-19 21:52:48 +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
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
bd2fdde759 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/sort_func.hpp
#	src/rail_cmd.cpp
#	src/timetable_cmd.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2019-04-23 08:11:52 +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
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
9f628e7e9a Show stops with timetabled wait time of 0 in departure board 2018-01-31 19:02:59 +00:00
Jonathan G Rennison
218085c535 Timetable: Implement autofill/automate for taken conditional orders. 
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
 2017-12-18 01:26:27 +00: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
19408cc2c7 Scheduled Dispatch: Fix mismatch departure board 
Also fix wrong arrival calculation that could happen. This still does not guarantee in general that vehicle actually departing will be the same as the one shown on the board.
 2017-06-28 21:05:13 +07: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
60ba68cc69 Update departure board to handle changed minutes. 
Use scaled date ticks internally.
 2015-08-30 19:40:58 +01:00
Jonathan G Rennison
010c290511 Departures: Scale dates in departures window by day length factor. 2015-08-22 00:36:28 +01:00
Jonathan G Rennison
803e8970c3 Departures: Fix major memory leak in MakeDepartureList. 2015-08-21 23:33:48 +01:00
Jonathan G Rennison
c6f38acbd6 Departures: Fix indentation/whitespace issues. 2015-08-21 23:06:52 +01:00
Jonathan G Rennison
1795fb5953 Fix departure boards with orders with timetabled 0 travel times, 
e.g. those with depot service orders.
 2015-08-09 17:08:57 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00