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
michi_cc
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
2012-02-14 17:04:06 +00:00
michi_cc
f2c694c8fb
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
2012-02-14 17:04:06 +00:00
michi_cc
8161459cfe
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
2012-02-14 17:04:01 +00:00
michi_cc
347157cb8c
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
2012-02-14 17:04:01 +00:00
planetmaker
7aa57e4acd
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
2011-05-18 12:19:58 +00:00
planetmaker
43c8cd1d5e
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
2011-05-18 12:19:58 +00:00
rubidium
87272273b5
(svn r22405) -Document: some more "random-ish" tidbits
2011-05-01 19:14:12 +00:00
rubidium
1a515e6344
(svn r22405) -Document: some more "random-ish" tidbits
2011-05-01 19:14:12 +00:00
rubidium
16d567eaa8
(svn r22013) -Codechange: move some functions out of functions.h
2011-02-07 22:08:11 +00:00
rubidium
750d369a2a
(svn r22013) -Codechange: move some functions out of functions.h
2011-02-07 22:08:11 +00:00
rubidium
c0f39415b9
(svn r21957) -Cleanup: gotodepot and timetabling settings are more or less useless; just don't use depot orders or timetabling if you don't want to use it
2011-02-04 15:13:20 +00:00
rubidium
4c5ca17486
(svn r21957) -Cleanup: gotodepot and timetabling settings are more or less useless; just don't use depot orders or timetabling if you don't want to use it
2011-02-04 15:13:20 +00:00
frosch
7c04ea586d
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
...
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
2011-01-31 20:44:15 +00:00
frosch
a97d52a29a
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
...
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
2011-01-31 20:44:15 +00:00
rubidium
738db7ef44
(svn r21832) -Feature: limit vehicle lateness to the length of a full timetable cycle, e.g. when a cycle takes 50 days and the vehicle is 65 days later reduce the lateness to 15 days
2011-01-18 14:27:43 +00:00
rubidium
3f900d3580
(svn r21832) -Feature: limit vehicle lateness to the length of a full timetable cycle, e.g. when a cycle takes 50 days and the vehicle is 65 days later reduce the lateness to 15 days
2011-01-18 14:27:43 +00:00