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
2 years ago
c40f4e0abc
Handle predictable conditional orders in departure boards
2 years ago
1ac6326306
Departure boards: Fix departure slot cache with multiple schedules
2 years ago
ff3473fe6a
Add support for multiple scheduled dispatch schedules per order list
2 years ago
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
764af07a33
Fix departure boards not handling unconditional order jumps
3 years ago
c0e267973f
Departure board: Skip vehicles with no orders
4 years ago
c7f6a711b3
Departures board: Fix handling of via orders for arrivals
4 years ago
a16d0b71b3
Fix handling of vehicles with no orders in departure board
...
See: #162
4 years ago
be3f03358f
Departure boards: Fix handling of waiting orders
...
See: #144
4 years ago
bca0187aaf
Schedule dispatch: Warn about and ignore departure slots outside the duration
4 years ago
ec0b5e0ed0
Improve performance of departures window
...
See: #119
5 years ago
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
5 years ago
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
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
5 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
9f628e7e9a
Show stops with timetabled wait time of 0 in departure board
6 years ago
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.
7 years ago
51e018c9a4
Merge branch 'departure-boards' into jgrpp
7 years ago
07ca7cfb8c
Add show passenger and show freight buttons to departure window
7 years ago
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.
7 years ago
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.
7 years ago
10ae23d3b9
Merge branch 'departure-boards' into jgrpp
...
VehicleListIdentifier API changes.
# Conflicts:
# src/departures.cpp
# src/vehicle_gui.cpp
8 years ago
31b2a39d02
Merge branch 'save_ext' into departure-boards
...
Adjust calls to GenerateVehicleSortList due to API change.
8 years ago
60ba68cc69
Update departure board to handle changed minutes.
...
Use scaled date ticks internally.
9 years ago
010c290511
Departures: Scale dates in departures window by day length factor.
9 years ago
803e8970c3
Departures: Fix major memory leak in MakeDepartureList.
9 years ago
c6f38acbd6
Departures: Fix indentation/whitespace issues.
9 years ago
1795fb5953
Fix departure boards with orders with timetabled 0 travel times,
...
e.g. those with depot service orders.
9 years ago
79138de1b9
Import departure boards patch
9 years ago
Jonathan G Rennison
innocenat
patch-import