TechGeekNZ
|
cf8ea74733
|
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
|
4 years ago |
TechGeekNZ
|
fe1925931d
|
Cleanup: Correct typographic errors in code comments.
|
4 years ago |
Jonathan G Rennison
|
43c538fa7d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/town_cmd.cpp
|
4 years ago |
TechGeekNZ
|
937b366546
|
Cleanup: StationCargoList::AreMergable doxygen comment references Vehicle instead of Station.
|
4 years ago |
Jonathan G Rennison
|
0100ea4e32
|
Conditional orders: Add mode to check waiting station cargo via next node
|
4 years ago |
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
|
5 years ago |
Jonathan G Rennison
|
5dc1027c6b
|
Add initial support for loading ChillPP v14.7 savegames
|
5 years ago |
glx
|
5fce5fa300
|
Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops
|
5 years ago |
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
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
Jonathan G Rennison
|
49dee941fb
|
Validate cargo packet deferred payments in CheckCaches
|
5 years ago |
Charles Pigott
|
2e1936da64
|
Codechange: Remove SourceTypeByte type
|
5 years ago |
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Jonathan G Rennison
|
64c71f5136
|
Add recalculated total to AssertCountConsistency assertion message
|
6 years ago |
Jonathan G Rennison
|
38779254e5
|
Check cargo action count consistencies on load
Add scope info logging to AfterLoadVehicles
|
6 years ago |
Jonathan G Rennison
|
1cc545c816
|
Fix iterator invalidation issues in CargoPacketList actions
See: #48
|
6 years ago |
Jonathan G Rennison
|
ab6119cb76
|
Merge branch 'infrastructure_sharing' into jgrpp
|
7 years ago |
Jonathan G Rennison
|
decc0f210c
|
Fix incorrect comment
|
7 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
|
a422cb6753
|
Use a deque instead of list for CargoPacketList and StationCargoPacketMap.
|
8 years ago |
fonsinchen
|
3f19e19952
|
(svn r26660) -Fix: CargoPacket::SourceStation() returns a StationID.
|
10 years ago |
fonsinchen
|
7096d42bb3
|
(svn r26660) -Fix: CargoPacket::SourceStation() returns a StationID.
|
10 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
|
88787412b6
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
11 years ago |
fonsinchen
|
809df5aaf6
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
11 years ago |
fonsinchen
|
bd230f34f4
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
11 years ago |
fonsinchen
|
fff00b6460
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
11 years ago |
fonsinchen
|
54db96be43
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
11 years ago |
fonsinchen
|
6ce6fd05d8
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
3dd811e179
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
1de46050f6
|
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
|
11 years ago |
fonsinchen
|
741c431caa
|
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
|
11 years ago |
fonsinchen
|
f022550df9
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
11 years ago |
fonsinchen
|
04e3eb6fab
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
11 years ago |
frosch
|
c5d7445704
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
11 years ago |
frosch
|
5eddbb338b
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
11 years ago |
rubidium
|
d27e49d078
|
(svn r25013) -Feature: show the amount of cargo that has already been reserved by full loading vehicles in the station (fonsinchen)
|
12 years ago |
rubidium
|
4367224b35
|
(svn r25013) -Feature: show the amount of cargo that has already been reserved by full loading vehicles in the station (fonsinchen)
|
12 years ago |
rubidium
|
7dd2354a13
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
12 years ago |
rubidium
|
cdb0a76958
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
12 years ago |
rubidium
|
79b74a5925
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
12 years ago |
rubidium
|
d6e2a8aa56
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
12 years ago |
rubidium
|
4301d77d65
|
(svn r25009) -Codechange: refactor bits of cargo packet (lists) to reduce duplicated code (fonsinchen)
|
12 years ago |
rubidium
|
71bbc130fc
|
(svn r25009) -Codechange: refactor bits of cargo packet (lists) to reduce duplicated code (fonsinchen)
|
12 years ago |
rubidium
|
84ca041564
|
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
|
12 years ago |