Commit Graph

68 Commits

Author SHA1 Message Date
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
d49dad9f9c (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
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
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
f022550df9 (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
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
michi_cc
64c5299b4d (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
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
957b643ae6 (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
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
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
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
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
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
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
alberth
0b0127b13d (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
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
b7bfae70a8 (svn r19215) -Codechange: Add Order::GetLocation() to deduplicate code. 2010-02-22 20:36:20 +00:00
rubidium
2e506b04aa (svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions 2009-11-21 12:43:09 +00:00
rubidium
cc7ba874b4 (svn r18202) -Codechange: remove an unused function 2009-11-20 22:00:28 +00:00
rubidium
310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 2009-09-19 09:51:14 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
edf7b21e18 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 2009-07-28 21:06:38 +00:00
yexo
3531315322 (svn r16613) -Fix [NewGRF]: some of the var action 2 80+ variables contained wrong results due to OpenTTD codechanges 2009-06-21 10:11:04 +00:00
smatz
3793b966c3 (svn r16380) -Codechange: rename pool.hpp to pool_type.hpp 2009-05-22 15:39:22 +00:00
smatz
50624d5c0f (svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved 2009-05-22 15:13:50 +00:00
smatz
7eb14aa49f (svn r16377) -Codechange: unify FOR_ALL_* macros, use separate index variable instead of var->index 2009-05-22 14:23:36 +00:00
smatz
769de62daf (svn r16338) -Codechange: split loading of references to two phases
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
2009-05-17 16:28:29 +00:00
rubidium
1cc82de384 (svn r16333) -Cleanup: remove a bunch of unused wrapper functions. 2009-05-17 11:18:34 +00:00
smatz
0c10daa243 (svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index) 2009-05-17 01:00:56 +00:00
smatz
cf986c3099 (svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize() 2009-05-16 23:44:36 +00:00
smatz
d495dc5dbc (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) 2009-05-16 23:34:14 +00:00
frosch
ac1b753f9a (svn r16199) -Codechange: Pass OrderNonStopFlags also to MakeGoToDepotOrder().
-Fix: 'Go non-stop to nearest depot'-orders did not work wrt. the 'non-stop' part.
-Fix: Adding 'Go to nearest depot'-orders did not respect the default setting for 'non-stop'.
2009-05-02 00:10:24 +00:00
rubidium
4c707c7414 (svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station. 2009-04-12 14:11:14 +00:00
smatz
91233ea596 (svn r14828) -Codechange: move most of save/load-specific code to separate files 2009-01-04 15:32:25 +00:00
rubidium
3ac0875cf6 (svn r14813) -Codechange: use uint instead of 'just' unsigned. 2009-01-03 17:28:22 +00:00
rubidium
f316796629 (svn r14803) -Codechange: move order list management into it's own class and remove the order count from the savegame as we can easily count that (PhilSophus) 2009-01-03 13:52:06 +00:00
rubidium
155a2ca1f4 (svn r14601) -Fix: the nearest depot and stop in depot orders didn't work together (the vehicle didn't stop). 2008-11-21 18:16:19 +00:00
rubidium
1ce0b03bf0 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 2008-05-06 15:11:33 +00:00