Jonathan G Rennison
e5a8dbee35
Through load: Fix handling of load if available cargo type orders
6 years ago
Jonathan G Rennison
534f23d1b7
Fix through load with multi-head engines
6 years ago
Jonathan G Rennison
5609394b4e
Through load: Fix handling of full-load orders
6 years ago
Jonathan G Rennison
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
Jonathan G Rennison
41c1a396ed
Changes to fix issues with cargo payment handling in through load
6 years ago
Jonathan G Rennison
a33153979e
Add scope info logging to LoadUnloadVehicle
6 years ago
Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
PeterN
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
Jonathan G Rennison
a08a79a9d8
Fix handling of refit with train through-load
6 years ago
Jonathan G Rennison
9be65dc96d
Fix use of wrong veh tile for station animation/trigger in through load
6 years ago
Jonathan G Rennison
2821599f6b
Better handle out of track and depot through load cases
...
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
6 years ago
Jonathan G Rennison
7c620edb52
Avoid auto-refitting to cargo which is marked no-load in per-cargo type order
6 years ago
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
Jonathan G Rennison
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
frosch
db54db00df
(svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu)
6 years ago
frosch
8f47687b84
(svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu)
6 years ago
Jonathan G Rennison
8c0c9274ea
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
7 years ago
Jonathan G Rennison
9000d74f3c
Pay all cargo payment incomes when cargo finally delivered
7 years ago
Jonathan G Rennison
093bd804cd
Merge branch 'save_ext' into infrastructure_sharing
7 years ago
Jonathan G Rennison
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
7 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
5a2fe49457
Add setting for transfer payment mode from source, minus transfers.
...
This is to reduce large negative payments for the final leg.
7 years ago
Jonathan G Rennison
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
peter1138
d31f9a83e7
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
7 years ago
peter1138
a77044f185
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
7 years ago
Jonathan G Rennison
24b3424ca3
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison
e79541b166
TBTR: Remove/change owner of template vehicles on company buy/deletion.
8 years ago
Jonathan G Rennison
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
Jonathan G Rennison
9ea018abc5
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
8 years ago
Jonathan G Rennison
a670966acf
Change GetNextStoppingStation to return per-cargo result(s).
8 years ago
Jonathan G Rennison
ed99dd2583
Change name of Order cargo-typed get load/unload type accessors.
...
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
8 years ago
Jonathan G Rennison
c1c983ea16
Import cargo type orders patch
...
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749
Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
Jonathan G Rennison
655b329142
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
8 years ago
frosch
b0c56f3432
(svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations.
8 years ago
frosch
0b2f8c13a2
(svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations.
8 years ago
frosch
dac94c7cbc
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
8 years ago
frosch
a66e0ff1f4
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
8 years ago
Jonathan G Rennison
6e545d1138
Merge branch 'infrastructure_sharing-sx' into jgrpp
8 years ago
Jonathan G Rennison
781bf73c6d
Fix incorrect calculation of final delivery payment.
...
Calculation was incorrect for partial packet delivery after a transfer.
8 years ago
Jonathan G Rennison
9c49ba43da
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
Yoonji Park
a6fd74d29a
Unreserve PBS block when company resetted.
...
(cherry picked from commit 281a84f3494713af9d86248b7c3a1998c41c30a0)
9 years ago
Jonathan G Rennison
7673436d3a
Trace restrict: add train ownership conditional.
...
Infra sharing whitespace fix.
9 years ago
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
9 years ago
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
9 years ago
frosch
32cb62a242
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
9 years ago
frosch
a7849377dd
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
9 years ago
frosch
e686add63a
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
9 years ago
frosch
eccbe842b3
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
9 years ago
fonsinchen
75cb16a7d7
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
10 years ago
fonsinchen
1b8186ea8e
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
10 years ago
fonsinchen
d6fc217136
(svn r26917) -Revert (r26857): It broke improved loading.
10 years ago
fonsinchen
7306fe015d
(svn r26917) -Revert (r26857): It broke improved loading.
10 years ago
fonsinchen
c4902c4150
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
10 years ago
fonsinchen
e353f22dc1
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
10 years ago
fonsinchen
dfbcd8869d
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
10 years ago
fonsinchen
672b14a7c6
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
10 years ago
fonsinchen
3648e95265
(svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit)
10 years ago
fonsinchen
b2e322a3fc
(svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit)
10 years ago
rubidium
b590a64718
(svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens
...
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
10 years ago
rubidium
81c2d75048
(svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens
...
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
10 years ago
rubidium
89c25b955e
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
10 years ago
rubidium
fb9dbf30fa
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
10 years ago
fonsinchen
11d98f043e
(svn r26549) -Change: better estimation for link capacities during full load
10 years ago
fonsinchen
b8381b6b25
(svn r26549) -Change: better estimation for link capacities during full load
10 years ago
fonsinchen
b5566ae6ec
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
10 years ago
fonsinchen
d5bd72296b
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
10 years ago
fonsinchen
3ee31a8f89
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
10 years ago
fonsinchen
c81a6070cb
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
10 years ago
fonsinchen
c915d9fa55
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
10 years ago
fonsinchen
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
10 years ago
fonsinchen
49f27eb247
(svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way.
10 years ago
fonsinchen
ba66343558
(svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way.
10 years ago
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
10 years ago
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
10 years ago
fonsinchen
88787412b6
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
11 years ago
fonsinchen
fbd6707afc
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
11 years ago
fonsinchen
9ad173c9cc
(svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft
11 years ago
fonsinchen
06548d7b05
(svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft
11 years ago
fonsinchen
ecdd796a86
(svn r26188) -Codechange: Move station refitting to a separate function.
11 years ago
fonsinchen
feaeb497e7
(svn r26188) -Codechange: Move station refitting to a separate function.
11 years ago
fonsinchen
63b43ed914
(svn r26187) -Fix: allow refitting at station if cargo has already been reserved.
11 years ago
fonsinchen
7d5640166f
(svn r26187) -Fix: allow refitting at station if cargo has already been reserved.
11 years ago
fonsinchen
6e1cc80926
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
11 years ago
fonsinchen
fb281ce23c
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
11 years ago
fonsinchen
54db96be43
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
11 years ago
fonsinchen
fff00b6460
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
11 years ago
fonsinchen
b09c4043ec
(svn r25565) -Codechange: Rewrite order prediction logic to introduce proper refit prediction
11 years ago
fonsinchen
ae5e88e186
(svn r25565) -Codechange: Rewrite order prediction logic to introduce proper refit prediction
11 years ago
frosch
934f4decba
(svn r25497) -Fix (r25479): byte is not unit
11 years ago
frosch
9e70d14a38
(svn r25497) -Fix (r25479): byte is not unit
11 years ago
frosch
7c9f0545b4
(svn r25479) -Fix (r23861): [NewGRF] When cargo NewGRF define a mulitplier to modify vehicle capacities, use the same multiplier to modify loading speed.
11 years ago
frosch
8cbb0ffa2b
(svn r25479) -Fix (r23861): [NewGRF] When cargo NewGRF define a mulitplier to modify vehicle capacities, use the same multiplier to modify loading speed.
11 years ago
fonsinchen
04e3eb6fab
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
fonsinchen
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
zuu
9aa1bf0264
(svn r25342) -Add: StoryPage data structures and GS API
11 years ago
zuu
65129db43c
(svn r25342) -Add: StoryPage data structures and GS API
11 years ago
fonsinchen
478fcadd21
(svn r25330) -Fix [FS#5583]: return some reserved cargo if vehicle is overloaded by station stopping acceptance for cargo scheduled to be delivered
11 years ago
fonsinchen
5ecf43a57f
(svn r25330) -Fix [FS#5583]: return some reserved cargo if vehicle is overloaded by station stopping acceptance for cargo scheduled to be delivered
11 years ago