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
5 years ago
glx
ebd4f32d15
Cleanup: remove core/sort_func.hpp as it's not used anymore
6 years ago
Jonathan G Rennison
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
6 years ago
glx
801cbea9cc
Codechange: use std::sort() for all std::vector types
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
6 years ago
glx22
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
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
6 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
Henry Wilson
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
6 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
Jonathan G Rennison
a67dc210b3
Fix vehicle ID truncation in CmdAutomateTimetable
6 years ago
Jonathan G Rennison
32353fdf03
Fix handling, display and input of hhmm times in timetables
...
With high ticks/min and day length values
6 years ago
Jonathan G Rennison
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
Jonathan G Rennison
ce6d6db4d5
Fix setting timetable leave early flag of current order
6 years ago
Jonathan G Rennison
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
Jonathan G Rennison
e55a327c09
Enable locking timetable travel times
6 years ago
Jonathan G Rennison
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
Jonathan G Rennison
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
Jonathan G Rennison
71852c3f37
Fix timetable auto-separation with go via station orders
6 years ago
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
7 years ago
Jonathan G Rennison
bb6b8d8cd6
Increase verbosity of some assertion failure messages
7 years ago
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.
7 years ago
Jonathan G Rennison
4528004bb8
Call UpdateScheduledDispatch() at first waiting, even when not travelling.
...
This is so that the schedule start point is advanced if a train
arrives at the first waiting point before but leaves at or after the
schedule end time.
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
Jonathan G Rennison
6ec8722258
Minor fixes and refactoring of timetable automation set/clear command.
8 years ago
Jonathan G Rennison
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
Jonathan G Rennison
d8a083b666
Allow timetable start dates to be set with full precision.
...
This avoids rounding of start dates when using minutes and
day length > 1.
8 years ago
Jonathan G Rennison
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
8 years ago
Jonathan G Rennison
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
8 years ago
Jonathan G Rennison
efcdd6c36f
Remove global automated timetable setting.
9 years ago
Jonathan G Rennison
ff5ee52b94
Add a company setting to control auto-fill timetable rounding.
9 years ago
Jonathan G Rennison
c0cc72ad96
Implement change timetable waiting time for all stations.
...
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
9 years ago
Jonathan G Rennison
d9466fa424
Merge branch 'auto_timetables-sx' into jgrpp
...
Fix day length scaling issue.
# Conflicts:
# src/timetable_cmd.cpp
9 years ago
Jonathan G Rennison
b43c08857b
Merge branch 'auto_timetables' into auto_timetables-sx
...
# Conflicts:
# src/saveload/saveload.h
9 years ago
Jonathan G Rennison
712d5e9c66
Fix set distributed timetable start not working when using minutes.
...
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
9 years ago
Jonathan G Rennison
c877e10272
Avoid set distributed timetable start setting start dates in the past.
...
Adjust start dates for vehicles before the base one forward by one
timetable duration if they would start before the present date.
Whitespace/format fixes.
9 years ago
Jonathan G Rennison
b24f540ac4
Fix distribution of shared order timetable start dates.
...
(Ctrl-click on start date in timetable GUI)
This is due to a scaling issue.
(cherry picked from commit 37140f0038
)
9 years ago
Jonathan G Rennison
64f408dd32
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
Jonathan G Rennison
4d368c24ed
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
Jonathan G Rennison
2d3a75e3c0
Revert "Fix distribution of shared order timetable start dates."
...
This reverts commit 37140f0038
.
This is in the wrong branch.
9 years ago
Jonathan G Rennison
cd23d17745
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/vehicle.cpp
9 years ago
Jonathan G Rennison
9eb07b4a77
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
Jonathan G Rennison
d2b87485fb
When clearing auto timetables, mark times as undefined rather than 0.
...
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
9 years ago
Jonathan G Rennison
a7e9c9ce65
Fix ClearSeparation() not being called when auto-separation disabled.
...
This can causes crashes if auto-separation is re-enabled as the
next/prev separation ptrs can end up dangling.
9 years ago
Jonathan G Rennison
b47c8825e7
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
Jonathan G Rennison
fe598efde5
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago