dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,933 Commits 1 Branch 0 Tags
9ad2f44ab75189b1ba810ac9667a383e5100855d
Commit Graph

821 Commits

Author SHA1 Message Date
Jonathan G Rennison
2c9029703b Add menu item to vehicle list to change order target. 
Allow moving depot/station/waypoint orders to a different depot/etc.
 2016-01-27 20:02:35 +00:00
Jonathan G Rennison
10b679bba5 Merge branch 'more_cond_orders-sx' into jgrpp 2016-01-25 23:29:31 +00:00
Jonathan G Rennison
8abdbcece6 Fix operator precedence issue in cargo waiting conditional order. 2016-01-25 23:29:15 +00:00
Jonathan G Rennison
64f408dd32 Merge branch 'auto_timetables-sx' into jgrpp 2016-01-19 19:32:37 +00:00
Jonathan G Rennison
84c604cb94 Fix auto timetable not being unset when sharing orders. 
Copy auto timetable when copying orders.
Clear autofill timetable when sharing, or copying automated orders.
 2016-01-19 19:25:11 +00:00
Jonathan G Rennison
cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/vehicle.cpp
 2015-11-30 22:32:29 +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
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
7bcd090a0f Add reverse at waypoint orders. 
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
 2015-10-28 23:50:22 +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
33233e8575 Fix references to renamed variables. 
Update comment on Order::UpdateJumpCounter.
 2015-08-26 23:07:02 +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
Jonathan G Rennison
ea5c33029b Fix various whitespace and style issues. 2015-08-26 22:49:08 +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
Jonathan G Rennison
4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
 2015-08-06 23:11:49 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +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
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
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
frosch
d10fe2ce21 (svn r26694) -Fix (r26547) [FS#6063]: When orders become invalid, reset the waiting time, but keep the travel time. 2014-07-16 22:24:55 +00:00
frosch
86c43ca183 (svn r26694) -Fix (r26547) [FS#6063]: When orders become invalid, reset the waiting time, but keep the travel time. 2014-07-16 22:24:55 +00:00
planetmaker
597de74ea0 (svn r26567) -Cleanup: Remove unused StringID offset in orders check 2014-05-06 20:53:08 +00:00
planetmaker
68af7a843c (svn r26567) -Cleanup: Remove unused StringID offset in orders check 2014-05-06 20:53:08 +00:00
planetmaker
a85838a618 (svn r26566) -Add [FS#6009]: Give a warning when a plane's orders tell it to use a runway which is too short for it (3298) 2014-05-06 20:50:58 +00:00
planetmaker
34b1d89dbe (svn r26566) -Add [FS#6009]: Give a warning when a plane's orders tell it to use a runway which is too short for it (3298) 2014-05-06 20:50:58 +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
frosch
a73cce7d3d (svn r26357) -Fix [FS#5845]: Some order options do not combine with others. (3298) 2014-02-19 20:56:44 +00:00
frosch
9479963b3b (svn r26357) -Fix [FS#5845]: Some order options do not combine with others. (3298) 2014-02-19 20:56: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
e0541a47e6 (svn r26263) -Fix [FS#5865]: Don't run into infinite recursion when getting next stopping station 2014-01-16 20:50:43 +00:00
fonsinchen
a5152be795 (svn r26263) -Fix [FS#5865]: Don't run into infinite recursion when getting next stopping station 2014-01-16 20:50:43 +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
2ea207b432 (svn r25718) -Fix: return INVALID from GetNextStoppingStation if vehicle would have to unload everything at this same station at the next stop 2013-08-11 11:00:09 +00:00
fonsinchen
b98de55d22 (svn r25718) -Fix: return INVALID from GetNextStoppingStation if vehicle would have to unload everything at this same station at the next stop 2013-08-11 11:00:09 +00:00
frosch
c9c2ce3f25 (svn r25562) -Fix [FS#5633]: If the next order cannot be resolved, reset the current order property instead of leaving it in an intermediate state. 2013-07-05 19:09:18 +00:00
frosch
840f836704 (svn r25562) -Fix [FS#5633]: If the next order cannot be resolved, reset the current order property instead of leaving it in an intermediate state. 2013-07-05 19:09:18 +00:00
fonsinchen
f022550df9 (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00