Commit Graph

125 Commits (102c55bc57000f09a24a1dd7a1d6836c5abb3a63)

Author SHA1 Message Date
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. 8 years ago
Jonathan G Rennison ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 8 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
8 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
Jonathan G Rennison 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
Jonathan G Rennison 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
Jonathan G Rennison 26d32269a3 Make auto TT separation rate a company setting.
Move auto TT by default setting to PLYX chunk.
9 years ago
Jonathan G Rennison 5dd3306850 Merge branch 'departure-boards-sx' into jgrpp 9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 671151474b Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 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
Jonathan G Rennison 365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 9 years ago
Jonathan G Rennison d24f7763cc Fix auto timetable separation to handle non-station orders sensibly. 9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 15c2327fd4 Merge branch 'master' into auto_timetables 9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 45d060f46f Day length patch: minor tweak to timetable lateness calculation.
_date_fract should also be multiplied by day length factor.
9 years ago
Jonathan G Rennison d70dbda351 Merge branch 'master' into day_length 9 years ago
patch-import d86a56cbef Import day length patch
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 33854a138f Merge branch 'save_ext' into auto_timetables-sx 9 years ago
Jonathan G Rennison 0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end,
whitespace & style, fix lang strings.
9 years ago
patch-import 80deb3c01d Import auto timetable separation patch
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 2f9ebebf02 Merge branch 'master' into wait_in_depot 9 years ago
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
Jonathan G Rennison 526cb42608 Merge branch 'master' into depature-boards
Conflicts:
	src/table/strgen_tables.h
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
frosch 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