a72b4881a0
Scheduled dispatch: Fix double dispatch request when no timetable set
...
See: #141
4 years ago
bca0187aaf
Schedule dispatch: Warn about and ignore departure slots outside the duration
4 years ago
9917a1daef
Scheduled dispatch: Add hints about dispatch order to timetable window
...
Adjust condition for dispatch order
4 years ago
98d76832fc
Scheduled dispatch: Do not require timetable to be fully timetabled
4 years ago
e53e960c50
Scheduled dispatch: Improvements to handling first order wait times
4 years ago
f79ec13852
Timetable automation: Bias wait time adjustments in positive direction
...
Remove case where wait time is set directly when it is less than half
the current value, this is still used for travel times.
5 years ago
7f2e6fb597
Exclude waypoint orders from set timetabled wait time for all orders
...
See #125
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
f9a8c3da46
Fix locked wait times not being preserved when moving orders to new station
5 years ago
a7cfe167a3
Handle case where vehicles have same unitnumber in VehicleTimetableSorter
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
ebd4f32d15
Cleanup: remove core/sort_func.hpp as it's not used anymore
5 years ago
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
5 years ago
801cbea9cc
Codechange: use std::sort() for all std::vector types
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
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
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
a67dc210b3
Fix vehicle ID truncation in CmdAutomateTimetable
5 years ago
32353fdf03
Fix handling, display and input of hhmm times in timetables
...
With high ticks/min and day length values
5 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
ce6d6db4d5
Fix setting timetable leave early flag of current order
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
e55a327c09
Enable locking timetable travel times
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
71852c3f37
Fix timetable auto-separation with go via station orders
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
bb6b8d8cd6
Increase verbosity of some assertion failure messages
7 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
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
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
6ec8722258
Minor fixes and refactoring of timetable automation set/clear command.
8 years ago
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
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
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
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
efcdd6c36f
Remove global automated timetable setting.
8 years ago
ff5ee52b94
Add a company setting to control auto-fill timetable rounding.
8 years ago
c0cc72ad96
Implement change timetable waiting time for all stations.
...
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
8 years ago
d9466fa424
Merge branch 'auto_timetables-sx' into jgrpp
...
Fix day length scaling issue.
# Conflicts:
# src/timetable_cmd.cpp
9 years ago
b43c08857b
Merge branch 'auto_timetables' into auto_timetables-sx
...
# Conflicts:
# src/saveload/saveload.h
9 years ago
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
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
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
64f408dd32
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
4d368c24ed
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
2d3a75e3c0
Revert "Fix distribution of shared order timetable start dates."
...
This reverts commit 37140f0038
9 years ago
cd23d17745
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/vehicle.cpp
9 years ago
9eb07b4a77
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
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
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
b47c8825e7
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
fe598efde5
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
37140f0038
Fix distribution of shared order timetable start dates.
...
(Ctrl-click on start date in timetable GUI)
This is due to a scaling issue.
9 years ago
b48a01f233
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/settings_gui.cpp
src/settings_type.h
9 years ago
26d32269a3
Make auto TT separation rate a company setting.
...
Move auto TT by default setting to PLYX chunk.
9 years ago
5dd3306850
Merge branch 'departure-boards-sx' into jgrpp
9 years ago
e3ca9524f5
Fix timetable rounding depending on the client time display mode setting.
...
This causes desyncs if clients and the server have different values
for this client setting.
9 years ago
671151474b
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/settings_gui.cpp
9 years ago
40ad3dea02
Auto separation: Add setting to scale vehicle lateness adjustments.
...
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.
The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.
Note that this is not savegame compatible.
9 years ago
cca6495d1e
Auto timetabling: bias timetable adjustment to favour negative adjustments.
...
This is to prevent positive feedback where timetable times are increased
due to congestion, which creates more congestion due to trains waiting
for extended periods at stations and/or due to timetable auto separation
going overboard due to overly long timetables.
* Double rate of negative adjustments.
* Half rate of positive adjustments.
* Only do step changes for large negative adjustments.
* Reduce jam detection threshold.
9 years ago
365f1c237f
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
d24f7763cc
Fix auto timetable separation to handle non-station orders sensibly.
9 years ago
34e41a2e26
Timetable GUI: Allow clearing of timetable time fields which are at 0.
...
Allow explicitly setting timetable time fields to 0 without clearing them.
9 years ago
15c2327fd4
Merge branch 'master' into auto_timetables
9 years ago
9565e5b9b1
Merge branch 'day_length-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/timetable_cmd.cpp
9 years ago
45d060f46f
Day length patch: minor tweak to timetable lateness calculation.
...
_date_fract should also be multiplied by day length factor.
9 years ago
d70dbda351
Merge branch 'master' into day_length
9 years ago
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
9 years ago
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
2f9ebebf02
Merge branch 'master' into wait_in_depot
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
526cb42608
Merge branch 'master' into depature-boards
...
Conflicts:
src/table/strgen_tables.h
9 years ago
79138de1b9
Import departure boards patch
9 years ago
891021cdd3
(svn r27302) -Fix [FS#6313] (r26550): Updating timetables need to check the timetable flags from the real order instead of from a copy. (marcole)
9 years ago
04c9ce9753
(svn r27302) -Fix [FS#6313] (r26550): Updating timetables need to check the timetable flags from the real order instead of from a copy. (marcole)
9 years ago
6f2937855a
(svn r27301) -Fix [FS#6313] (r26550): Modifying timetable times or speeds always confirmed all pre-estimated values.
9 years ago
3d0d86b85d
(svn r27301) -Fix [FS#6313] (r26550): Modifying timetable times or speeds always confirmed all pre-estimated values.
9 years ago
726e1b6920
(svn r26574) -Fix [FS#6006]: Don't reset current order wait time if it's timetabled.
10 years ago
e673115842
(svn r26574) -Fix [FS#6006]: Don't reset current order wait time if it's timetabled.
10 years ago
d4aae15fa5
(svn r26550) -Change: Show measured order times in timetable GUI
10 years ago
64e4e52c33
(svn r26550) -Change: Show measured order times in timetable GUI
10 years ago
c81a6070cb
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
10 years ago
3ee31a8f89
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
10 years ago
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
10 years ago
c915d9fa55
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
Jonathan G Rennison
S. D. Cloudt
glx
Henry Wilson
glx22
innocenat
patch-import
frosch
fonsinchen
rubidium