dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,115 Commits 1 Branch 0 Tags
1bfd96c7f29f70e0903b5a9ab0044f41c097ce4c
Commit Graph

282 Commits

Author SHA1 Message Date
Jonathan G Rennison
9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 2015-11-30 22:31:08 +00:00
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.
 2015-11-30 22:28:38 +00:00
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.
 2015-11-30 22:28:20 +00:00
Jonathan G Rennison
b47c8825e7 Merge branch 'auto_timetables-sx' into jgrpp 2015-11-01 01:56:16 +00:00
Jonathan G Rennison
fe598efde5 Merge branch 'auto_timetables' into auto_timetables-sx 2015-11-01 01:56:06 +00:00
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.
 2015-11-01 01:55:46 +00:00
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
 2015-10-25 21:50:14 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting. 
Move auto TT by default setting to PLYX chunk.
 2015-10-25 21:41:25 +00:00
Jonathan G Rennison
5dd3306850 Merge branch 'departure-boards-sx' into jgrpp 2015-10-21 18:51:19 +01:00
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.
 2015-10-21 18:48:12 +01:00
Jonathan G Rennison
671151474b Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/settings_gui.cpp
 2015-08-11 21:43:12 +01:00
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.
 2015-08-11 21:20:01 +01:00
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.
 2015-08-11 21:14:58 +01:00
Jonathan G Rennison
365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 2015-08-09 17:11:11 +01:00
Jonathan G Rennison
d24f7763cc Fix auto timetable separation to handle non-station orders sensibly. 2015-08-09 17:07:50 +01:00
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.
 2015-08-09 17:07:46 +01:00
Jonathan G Rennison
15c2327fd4 Merge branch 'master' into auto_timetables 2015-08-09 17:07:41 +01:00
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
 2015-08-09 13:51:36 +01:00
Jonathan G Rennison
45d060f46f Day length patch: minor tweak to timetable lateness calculation. 
_date_fract should also be multiplied by day length factor.
 2015-08-09 12:07:57 +01:00
Jonathan G Rennison
d70dbda351 Merge branch 'master' into day_length 2015-08-09 12:04:23 +01:00
patch-import
d86a56cbef Import day length patch 
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
 2015-08-09 11:23:15 +01:00
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
 2015-08-04 22:08:59 +01:00
Jonathan G Rennison
33854a138f Merge branch 'save_ext' into auto_timetables-sx 2015-08-04 21:30:30 +01:00
Jonathan G Rennison
0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end, 
whitespace & style, fix lang strings.
 2015-08-04 21:29:19 +01:00
patch-import
80deb3c01d Import auto timetable separation patch 
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
 2015-08-04 21:27:23 +01:00
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
 2015-08-03 01:12:16 +01:00
Jonathan G Rennison
2f9ebebf02 Merge branch 'master' into wait_in_depot 2015-08-03 01:06:55 +01:00
patch-import
d8c5de188f Import timetabling wait time in depots patch 
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
 2015-08-03 01:06:12 +01:00
Jonathan G Rennison
526cb42608 Merge branch 'master' into depature-boards 
Conflicts:
	src/table/strgen_tables.h
 2015-08-01 20:39:16 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
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) 2015-06-20 12:04:30 +00:00
frosch
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) 2015-06-20 12:04:30 +00:00
frosch
6f2937855a (svn r27301) -Fix [FS#6313] (r26550): Modifying timetable times or speeds always confirmed all pre-estimated values. 2015-06-20 11:28:25 +00:00
frosch
3d0d86b85d (svn r27301) -Fix [FS#6313] (r26550): Modifying timetable times or speeds always confirmed all pre-estimated values. 2015-06-20 11:28:25 +00:00
fonsinchen
726e1b6920 (svn r26574) -Fix [FS#6006]: Don't reset current order wait time if it's timetabled. 2014-05-11 09:59:30 +00:00
fonsinchen
e673115842 (svn r26574) -Fix [FS#6006]: Don't reset current order wait time if it's timetabled. 2014-05-11 09:59:30 +00:00
fonsinchen
d4aae15fa5 (svn r26550) -Change: Show measured order times in timetable GUI 2014-05-01 14:53:06 +00:00
fonsinchen
64e4e52c33 (svn r26550) -Change: Show measured order times in timetable GUI 2014-05-01 14:53:06 +00:00
fonsinchen
c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
fonsinchen
c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
rubidium
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 2014-04-23 20:13:33 +00:00
rubidium
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 2014-04-23 20:13:33 +00:00
rubidium
9b9acbbe2c (svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders 2013-07-17 18:37:13 +00:00
rubidium
fb1d479a51 (svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders 2013-07-17 18:37:13 +00:00
rubidium
7c4b623d7d (svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date 2013-06-09 13:55:33 +00:00
rubidium
a2af1f69af (svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date 2013-06-09 13:55:33 +00:00
michi_cc
6c490affb6 (svn r24053) -Fix (r23947) [FS#5111]: Crash when timetabling a maximum travel speed of 0. 2012-03-20 13:11:20 +00:00
michi_cc
bf3505ca1b (svn r24053) -Fix (r23947) [FS#5111]: Crash when timetabling a maximum travel speed of 0. 2012-03-20 13:11:20 +00:00