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
|
3 years ago |
|
Jonathan G Rennison
|
3dd52c6198
|
Fix scrollbar functionality in schedule dispatch window
|
4 years ago |
|
Jonathan G Rennison
|
f5e9805b10
|
Store time display settings both in savegame and client, add setting
|
4 years ago |
|
Jonathan G Rennison
|
bca0187aaf
|
Schedule dispatch: Warn about and ignore departure slots outside the duration
|
4 years ago |
|
Jonathan G Rennison
|
ab1b8ab209
|
Scheduled dispatch: Add schedule end time to info line
|
4 years ago |
|
Jonathan G Rennison
|
bffd52b74a
|
Scheduled dispatch: Do not show required vehicles if conditional order present
|
4 years ago |
|
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
|
5 years ago |
|
Jonathan G Rennison
|
24458e9990
|
Add various missing override specifiers
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
innocenat
|
b93a4d6daa
|
Fix input and display of hhmm times in scheduled dispatch GUI
When using high ticks/min and day length
|
5 years ago |
|
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
|
6 years ago |
|
Jonathan G Rennison
|
c00d049057
|
Scheduled dispatch: Don't show invalid required vehicle estimate
|
6 years ago |
|
innocenat
|
1b3969a014
|
Fix scheduled dispatch for multiplayer
|
7 years ago |
|
innocenat
|
c4c891a6c1
|
Proper handling of invalid text input in scheduled dispatch
|
7 years ago |
|
Jonathan G Rennison
|
bcbe74f339
|
Adjust formatting of schedule dispatch summary.
Use different string if departure hasn't left yet.
|
7 years ago |
|
Jonathan G Rennison
|
27d9255f53
|
Fix trailing whitespace in schdispatch_gui.cpp
|
7 years ago |
|
innocenat
|
0b8f0e64ec
|
Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
|
7 years ago |