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
planetmaker
597de74ea0
(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
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
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
frosch
a73cce7d3d
(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
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
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
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
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
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
rubidium
8539c04192
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
2013-02-14 17:06:49 +00:00
peter1138
f0cf9952e5
(svn r24936) -Fix [FS#5446]: Don't allow order refit to be set for no-load orders.
2013-01-23 18:33:28 +00:00
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
michi_cc
37da99ab90
(svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum.
2012-12-20 19:44:02 +00:00
michi_cc
ff5295c098
(svn r24457) -Fix [FS#5264] (r23087): Changing auto-refit for a 'goto station' order was inadvertently modifying the full load state.
2012-08-03 14:15:52 +00:00
frosch
cf93e860df
(svn r24390) -Change [FS#5213]: Allow cloning of orders which are unreachable for the destination vehicle if they were already unreachable for the source vehicle. This makes cloning/autorenewing/autoreplacing behave more smooth during station reconstruction.
2012-07-09 18:45:35 +00:00
frosch
ae4681ab4c
(svn r24282) -Codechange: Add AddVehicleAdviceNewsItem function to preemptively deduplicate code.
2012-05-26 14:15:52 +00:00
frosch
48a611de9e
(svn r24086) -Fix [FS#5131] (r23504): Cloning orders of aircraft with limited range failed.
2012-04-01 19:56:08 +00:00
michi_cc
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
2012-02-14 17:04:06 +00:00
frosch
01ef8aa478
(svn r23859) -Fix: Inserting conditional orders for ships checked the wrong orders wrt. maximum distance.
2012-01-27 22:08:51 +00:00
rubidium
8025579827
(svn r23849) -Fix [FS#5008]: when the network is lagging, you try to copy a vehicle's order but accidentally create a station order and then copy the vehicle's order (before the first command is executed) one could trigger an assertion from the pool. Simplify the ancient code and make it more fool proof, even though it could stop copying a vehicle's orders slightly earlier than it would now... but who has come near that limit and really needed that many orders?
2012-01-25 18:34:38 +00:00
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
2012-01-03 21:32:51 +00:00
planetmaker
8017f95b72
(svn r23511) -Fix [FS#4885] (r23504): Aircraft orders could not be shared anymore when they had no range property declared (Hirundo)
2011-12-13 21:10:43 +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
700c1682ce
(svn r23464) -Fix [FS#4876]: clear the backed up orders of a removed station as well, otherwise one could create orders to a station that was never in the original backupped orders. For example a road vehicle trying to go to a buoy.
2011-12-09 20:48:13 +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
