Jonathan G Rennison
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
2020-01-06 18:45:51 +00:00
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
2019-11-12 18:43:10 +00:00
Jonathan G Rennison
ca4db69f12
Fix OrderDestinationIsAllowed not handling nearest depot orders
2019-09-27 08:19:24 +01:00
Jonathan G Rennison
96f000226e
Exclude virtual trains from various vehicle list iterations
2019-05-27 17:56:41 +01:00
Jonathan G Rennison
8a4ba9f9c1
Fix VehiclePositionIsAllowed for aircraft taking off/landing
...
Fix use of IsValidTile
2019-05-11 21:20:37 +01:00
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
2018-03-26 20:12:50 +01:00
Jonathan G Rennison
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
2017-12-31 14:29:15 +00:00
Jonathan G Rennison
df3c10c523
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/infrastructure.cpp
# src/order_cmd.cpp
2017-02-22 20:58:39 +00:00
Jonathan G Rennison
f3b1059930
Fix order removal due to shared-infra company deletion.
...
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
2017-02-22 20:58:24 +00:00
Jonathan G Rennison
de26cf78e5
Merge branch 'infrastructure_sharing' into jgrpp
2016-10-24 18:29:09 +01:00
Jonathan G Rennison
15dc498c79
Fix wrong calculation of infra sharing track deletion train repayment.
...
Head pointer was being used for vehicle value on iteration of
train vehicles.
2016-10-24 18:29:02 +01:00
Jonathan G Rennison
320233fc9b
Fix VehiclePositionIsAllowed triggering assertions on virtual trains.
...
This fixes the bug where a bankruptcy/company reset when another
company owned a virtual train caused an assertion failure.
2016-03-10 00:15:52 +00:00
Jonathan G Rennison
910edffee0
Add scope info logging for HandleSharingCompanyDeletion.
2016-03-10 00:15:52 +00: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
