Jonathan G Rennison
2e6b4cc961
Merge branch 'reverse_at_waypoint' into jgrpp
...
Conflicts:
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/train_cmd.cpp
2015-10-29 00:59:42 +00:00
Jonathan G Rennison
78f8627c34
Add order waypoint flags.
2015-10-28 22:36:21 +00:00
Jonathan G Rennison
8357b911e5
Merge branch 'more_cond_orders-sx' into jgrpp
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-26 23:24:41 +01:00
Jonathan G Rennison
ffdd845b1c
Merge branch 'master' into more_cond_orders
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/saveload.cpp
src/saveload/saveload.h
2015-08-26 22:51:47 +01:00
patch-import
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
2015-08-26 22:28:20 +01:00
Jonathan G Rennison
f0fecda985
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
2015-08-09 23:45:21 +01:00
Jonathan G Rennison
117599ec7f
Order occupancy: Add column to orders GUI to show occupancy running average.
...
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
2015-08-09 23:39: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
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
fonsinchen
f0766d894c
(svn r26267) -Fix [FS#5865]: Really fix the infinite recursion problem and always consider all branches of conditional orders as possible next stopping stations.
2014-01-19 09:27:44 +00:00
fonsinchen
7e91f96b92
(svn r26267) -Fix [FS#5865]: Really fix the infinite recursion problem and always consider all branches of conditional orders as possible next stopping stations.
2014-01-19 09:27:44 +00:00
fonsinchen
fff00b6460
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
2013-10-20 13:47:58 +00:00
fonsinchen
54db96be43
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
2013-10-20 13:47:58 +00:00
fonsinchen
40120e1bad
(svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code
2013-08-20 21:22:35 +00:00
fonsinchen
5c0b766ed9
(svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code
2013-08-20 21:22:35 +00:00
fonsinchen
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
2013-06-09 13:03:48 +00:00
fonsinchen
04e3eb6fab
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
2013-06-09 13:03:48 +00:00
rubidium
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
2013-05-19 14:22:04 +00:00
rubidium
3947453277
(svn r25259) -Codechange: track capacities and usage of links
2013-05-19 14:22:04 +00:00
frosch
972c4560dc
(svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case.
2013-02-24 16:41:51 +00:00
frosch
22bb015f3d
(svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case.
2013-02-24 16:41:51 +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
ca633163ed
(svn r23507) -Fix (r23505): Comment typo.
2011-12-13 00:54:13 +00:00
michi_cc
2a776a6ca3
(svn r23507) -Fix (r23505): Comment typo.
2011-12-13 00:54:13 +00:00
michi_cc
708b58b484
(svn r23505) -Add: Indication in the order list if the next destination of an order is out of range.
2011-12-13 00:43:48 +00:00
michi_cc
34ffd08a19
(svn r23505) -Add: Indication in the order list if the next destination of an order is out of range.
2011-12-13 00:43:48 +00:00
michi_cc
957b643ae6
(svn r23504) -Feature: Aircraft range.
2011-12-13 00:43:35 +00:00
michi_cc
def8e7215b
(svn r23504) -Feature: Aircraft range.
2011-12-13 00:43:35 +00:00
rubidium
bec64ece5a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
2011-11-12 18:06:34 +00:00
rubidium
fb63543e2a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
2011-11-12 18:06:34 +00:00
michi_cc
886bd3c4c7
(svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it.
2011-11-04 00:38:51 +00:00
michi_cc
f200ffa90c
(svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it.
2011-11-04 00:38:51 +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
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
2011-01-18 23:09:43 +00:00
rubidium
9ca4b629cd
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
2011-01-18 23:09:43 +00:00
rubidium
1446bfaac6
(svn r21644) -Change: keep showing "No orders" when the order list is filled with only automatic orders
2010-12-26 13:25:34 +00:00
rubidium
28f16a732f
(svn r21644) -Change: keep showing "No orders" when the order list is filled with only automatic orders
2010-12-26 13:25:34 +00:00
rubidium
4d6841b553
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
2010-12-26 09:03:19 +00:00
rubidium
64f04c3a74
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
2010-12-26 09:03:19 +00:00
rubidium
bde1973e7a
(svn r21602) -Codechange: split actual adding/removing of orders to/from a vehicle's order list from the validation of those (user) commands. Based on patch by fonsinchen
2010-12-22 21:16:34 +00:00
rubidium
a38a1e7b0d
(svn r21602) -Codechange: split actual adding/removing of orders to/from a vehicle's order list from the validation of those (user) commands. Based on patch by fonsinchen
2010-12-22 21:16:34 +00:00
alberth
0b0127b13d
(svn r21593) -Codechange: endif comment correcttions.
2010-12-22 10:50:32 +00:00
alberth
f65a9a5515
(svn r21593) -Codechange: endif comment correcttions.
2010-12-22 10:50:32 +00:00
frosch
c18839704b
(svn r20286) -Codechange: Unify end of doxygen comments.
2010-08-01 19:44:49 +00:00
frosch
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
2010-08-01 19:44:49 +00:00