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
9 years ago
ea5c33029b
Fix various whitespace and style issues.
9 years ago
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
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
9 years ago
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.
9 years ago
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
9 years ago
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
9 years ago
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
9 years ago
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
9 years ago
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
d10fe2ce21
(svn r26694) -Fix (r26547) [FS#6063]: When orders become invalid, reset the waiting time, but keep the travel time.
10 years ago
597de74ea0
(svn r26567) -Cleanup: Remove unused StringID offset in orders check
10 years ago
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)
10 years ago
c81a6070cb
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
10 years ago
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
10 years ago
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
10 years ago
a73cce7d3d
(svn r26357) -Fix [FS#5845]: Some order options do not combine with others. (3298)
11 years ago
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.
11 years ago
e0541a47e6
(svn r26263) -Fix [FS#5865]: Don't run into infinite recursion when getting next stopping station
11 years ago
fff00b6460
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
11 years ago
40120e1bad
(svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code
11 years ago
2ea207b432
(svn r25718) -Fix: return INVALID from GetNextStoppingStation if vehicle would have to unload everything at this same station at the next stop
11 years ago
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.
11 years ago
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
11 years ago
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.
12 years ago
8539c04192
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
12 years ago
f0cf9952e5
(svn r24936) -Fix [FS#5446]: Don't allow order refit to be set for no-load orders.
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
37da99ab90
(svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum.
12 years ago
ff5295c098
(svn r24457) -Fix [FS#5264] (r23087): Changing auto-refit for a 'goto station' order was inadvertently modifying the full load state.
12 years ago
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.
12 years ago
ae4681ab4c
(svn r24282) -Codechange: Add AddVehicleAdviceNewsItem function to preemptively deduplicate code.
12 years ago
48a611de9e
(svn r24086) -Fix [FS#5131] (r23504): Cloning orders of aircraft with limited range failed.
12 years ago
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
01ef8aa478
(svn r23859) -Fix: Inserting conditional orders for ships checked the wrong orders wrt. maximum distance.
13 years ago
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?
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
8017f95b72
(svn r23511) -Fix [FS#4885] (r23504): Aircraft orders could not be shared anymore when they had no range property declared (Hirundo)
13 years ago
708b58b484
(svn r23505) -Add: Indication in the order list if the next destination of an order is out of range.
13 years ago
957b643ae6
(svn r23504) -Feature: Aircraft range.
13 years ago
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.
13 years ago
bec64ece5a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
886bd3c4c7
(svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it.
13 years ago
ed2cfbd321
(svn r22858) -Feature: Conditional order depending on remaining lifetime of a vehicle. (monoid)
13 years ago
8c335b8db6
(svn r22845) -Fix [FS#4745]: perform stricter checks on some commands (monoid)
13 years ago
03ca1c2c39
(svn r22620) -Change [FS#4651]: Enforce refit orders to be 'always go to depot' orders; service-only and stop-in-depot orders make no sense with refitting.
13 years ago
9219281a2b
(svn r22589) -Fix [FS#4641]: PBS order forecasting modified the current order index in case of a goto-nearest-depot order and no depot could be found.
13 years ago
7aa57e4acd
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
13 years ago
58c4de2caf
(svn r22331) -Change: When inserting an (automatic) order A in front of an order B, disable modifications of automatic orders for all vehicles currently heading for B as we do not know whether they will reach A or B first. (except for the vehicle causing the insertion of the automatic order itself)
13 years ago
aee1e06273
(svn r22330) -Change: When a conditional order triggers and causes skipping to a particular order, disable modifications to automatic orders. till reaching the next real order, as we do not know whether to change the targets of conditional orders when inserting automatic orders. (So, when the vehicle skips to an order and later inserts an automatic order, the conditional order will still point to the same order, so the automatic order will be inserted again the next time.)
13 years ago
5429d70496
(svn r22326) -Fix: Destinations of conditional orders were update incorrectly when deleting orders in front of the conditional orders, if the target order wwas the order just before of the conditional order.
13 years ago
cc731e256e
(svn r22200) -Fix (r21642): removing a station order could stop when removing first automatic order
14 years ago
c85e1c3089
(svn r22116) -Codechange: use PoolBase::Clean() at more places
14 years ago
f71d55a5ec
(svn r22105) -Fix: crash when copying an orderlist to a vehicle that already had orders
14 years ago
d762b17f40
(svn r22046) -Fix [FS#4487]: Make sure order indices stay in range when copying, sharing, unsharing or deleting all orders.
14 years ago
84514c8333
(svn r22045) -Codechange: Move cancelling the current loading order on deleting the current order to a separate function.
14 years ago
17b2021297
(svn r22024) -Fix [FS#4468]: verify we can allocate an OrderList before we actually try to do so (Rubidium)
14 years ago
8183922813
(svn r22021) -Fix (r22019): ofcourse make doesn't notice files are gone, so it doesn't recompile everything that needs to be recompiled...
14 years ago
1afea0803f
(svn r21961) -Remove: limitation that not loading and not unloading is mutual exclusive
14 years ago
3847bac973
(svn r21934) -Fix (r21933): The original plan was to run the regression before committing.
14 years ago
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.
14 years ago
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
6ae5911ed0
(svn r21809) -Fix [FS#4404]: remove unreached automatic orders as well when reaching an ordered waypoint or depot (fonsinchen)
14 years ago
37069cb59d
(svn r21744) -Fix: Allow Ctrl+Clicking automatic orders for scrolling to their destination.
14 years ago
cc2c7ae5e6
(svn r21739) -Fix [FS#4388] (r19657): make clearing refit orders work again
14 years ago
9249278833
(svn r21737) -Fix (r1)[FS#4384-ish]: A loading order was also marked as 'not part of orders' when the order before the current order was deleted.
14 years ago
1446bfaac6
(svn r21644) -Change: keep showing "No orders" when the order list is filled with only automatic orders
14 years ago
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
14 years ago
8eccfcdd42
(svn r21603) -Codechange: no need to assign something to a variable and then test it for NULL when you're never using it again
14 years ago
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
14 years ago
47c9189002
(svn r21516) -Codechange: Add IsGroundVehicle function to the Vehicle class.
14 years ago
d5bdeb3589
(svn r21466) -Codechange: make VehicleHasDepotOrders a function of Vehicle.
14 years ago
9f3845227e
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
75329688e6
(svn r20600) -Fix [FS#4075]: "downscale" a full load order to a load if possible order when removing the order while the vehicle is loading. This to prevent the vehicle from (possibly) staying forever in the station
14 years ago
5067ec50ce
(svn r20580) -Fix [FS#4039]: go via station and go via waypoint behaved differently when a train went back to the same (unordered) station again
14 years ago
0d018b5840
(svn r20571) -Codechange: free/reserve some bits in the order commands to increase the vehicle pool limit
14 years ago
27e45d96a4
(svn r20547) -Change: the way order backups are performed. Now restoring an order doesn't require up to 765 commands.
14 years ago
e68cf6bd81
(svn r20539) -Codechange: make order backups more self-contained.
14 years ago
e5420d89d5
(svn r20498) -Fix [FS#4030]: ignore the non-stop state when comparing one order type to another order type
14 years ago
33c41bbfed
(svn r20441) -Fix [FS#4024]: adding "goto nearest depot and stop" orders in one go was denied. This caused both AI adding those orders and backed up order restoration to fail.
14 years ago
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
8c85b4ce3d
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
f10c7255f4
(svn r20229) -Fix [FS#3986]: "Service at nearest depot" behaved the same as "Go to nearest depot"
14 years ago
137e2b64c9
(svn r20211) -Codechange: Indented code should have curly braces around it.
14 years ago
bf721f39af
(svn r19657) -Fix: Add saneness checks for front vehicles.
14 years ago
ed80045221
(svn r19654) -Codechange: Use Extract<> in more places.
14 years ago
72d62fd6fc
(svn r19494) -Codechange: Remove _error_message.
14 years ago
8109a0ad7f
(svn r19483) -Codechange: Code layout fixes, and parentheses reduction.
14 years ago
79909cedee
(svn r19463) -Codechange: add helper function to determine if an airport has at least one hangar
14 years ago
22a27d3b62
(svn r19455) -Codechange: split all airport information in Station to a seperate class
14 years ago
d5fe3f96c7
(svn r19405) -Codechange: CheckOwnership() returns a CommandCost.
15 years ago
b7bfae70a8
(svn r19215) -Codechange: Add Order::GetLocation() to deduplicate code.
15 years ago
baeeb024ea
(svn r19210) -Fix: GetDestination() is invalid for nearest-depot orders.
15 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
84cd40a483
(svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there
15 years ago
3de085a143
(svn r18683) -Fix: it's not an other
15 years ago
cb0cfca653
(svn r18660) -Cleanup: remove useless function
15 years ago
Jonathan G Rennison
patch-import
frosch
planetmaker
fonsinchen
rubidium
peter1138
michi_cc
smatz
yexo
terkhen
alberth