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
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
a08a79a9d8
Fix handling of refit with train through-load
6 years ago
9be65dc96d
Fix use of wrong veh tile for station animation/trigger in through load
6 years ago
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
7c620edb52
Avoid auto-refitting to cargo which is marked no-load in per-cargo type order
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
db54db00df
(svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu)
6 years ago
8f47687b84
(svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu)
6 years ago
8c0c9274ea
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
9000d74f3c
Pay all cargo payment incomes when cargo finally delivered
6 years ago
093bd804cd
Merge branch 'save_ext' into infrastructure_sharing
6 years ago
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
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
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
d31f9a83e7
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
7 years ago
a77044f185
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
7 years ago
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
e79541b166
TBTR: Remove/change owner of template vehicles on company buy/deletion.
8 years ago
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
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
a670966acf
Change GetNextStoppingStation to return per-cargo result(s).
8 years ago
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
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
655b329142
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
8 years ago
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
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
dac94c7cbc
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
8 years ago
a66e0ff1f4
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
8 years ago
6e545d1138
Merge branch 'infrastructure_sharing-sx' into jgrpp
8 years ago
781bf73c6d
Fix incorrect calculation of final delivery payment.
...
Calculation was incorrect for partial packet delivery after a transfer.
8 years ago
9c49ba43da
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
a6fd74d29a
Unreserve PBS block when company resetted.
...
(cherry picked from commit 281a84f3494713af9d86248b7c3a1998c41c30a0)
9 years ago
7673436d3a
Trace restrict: add train ownership conditional.
...
Infra sharing whitespace fix.
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
32cb62a242
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
9 years ago
a7849377dd
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
9 years ago
e686add63a
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
9 years ago
eccbe842b3
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
9 years ago
75cb16a7d7
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
10 years ago
1b8186ea8e
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
10 years ago
d6fc217136
(svn r26917) -Revert (r26857): It broke improved loading.
10 years ago
7306fe015d
(svn r26917) -Revert (r26857): It broke improved loading.
10 years ago
c4902c4150
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
10 years ago
e353f22dc1
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
10 years ago
Jonathan G Rennison
PeterN
frosch
peter1138
Yoonji Park
patch-import
fonsinchen