Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
4 years ago |
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
4 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
4 years ago |
Charles Pigott
|
52f3abba6e
|
Cleanup: Remove unnecessary assert_tcompile macro
|
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
|
1c768705a1
|
Use lower_bound instead of equal_range in StationCargoList::ShiftCargo
Calling erase could potentially invalidate the upper_bound iterator
|
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 |
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 |
Jonathan G Rennison
|
0246d59c8d
|
FlowStat: Replace btree_map with flat map which is inlined in small case
Inline storage for size <= 2
Size = 1 is ~90%
Size = 2 is ~9%
Size >=3 is ~1% and gets a separate allocation
|
5 years ago |
Jonathan G Rennison
|
90550d9642
|
FlowStatMap: Replace RB-tree with btree-indexed vector
|
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 |
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
Jonathan G Rennison
|
1cc545c816
|
Fix iterator invalidation issues in CargoPacketList actions
See: #48
|
7 years ago |
Jonathan G Rennison
|
ab6119cb76
|
Merge branch 'infrastructure_sharing' into jgrpp
|
7 years ago |
Jonathan G Rennison
|
2c16800454
|
Add debug console command to show cargo packet deferred payment stats
|
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 |
Jonathan G Rennison
|
495aa729df
|
Fix VehicleCargoList::Truncate when not all cargo is MTA_KEEP.
|
9 years ago |
fonsinchen
|
a363b2c317
|
(svn r26575) -Change [FS#5995]: Add an assert to catch underflowing action counts.
|
11 years ago |
fonsinchen
|
1dc630ff26
|
(svn r26575) -Change [FS#5995]: Add an assert to catch underflowing action counts.
|
11 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
|
11 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
|
11 years ago |
frosch
|
858e80f3dd
|
(svn r26333) -Fix: Compilation without static_assert.
|
11 years ago |
frosch
|
a92bf49191
|
(svn r26333) -Fix: Compilation without static_assert.
|
11 years ago |
frosch
|
03169121c2
|
(svn r26328) -Fix: Warnings and compilation failures.
|
11 years ago |
frosch
|
6040da6654
|
(svn r26328) -Fix: Warnings and compilation failures.
|
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
|
fbd6707afc
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
11 years ago |
fonsinchen
|
f528d2c592
|
(svn r25910) -Fix: Guard against empty FlowStats in a few more places.
|
11 years ago |
fonsinchen
|
49d2cd4049
|
(svn r25910) -Fix: Guard against empty FlowStats in a few more places.
|
11 years ago |
fonsinchen
|
bd230f34f4
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
11 years ago |
fonsinchen
|
809df5aaf6
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
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
|
6ce4c1808b
|
(svn r25715) -Fix: return correct value from StationCargoList::Reserve, fix some documentation and simplify StationCargoList::Load a bit
|
11 years ago |
fonsinchen
|
8bec8a982b
|
(svn r25715) -Fix: return correct value from StationCargoList::Reserve, fix some documentation and simplify StationCargoList::Load a bit
|
11 years ago |
fonsinchen
|
3dd811e179
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
6ce6fd05d8
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
c9452bbbff
|
(svn r25419) -Fix: assign some random other source station to packets which have lost their source
|
11 years ago |
fonsinchen
|
647d92c0d5
|
(svn r25419) -Fix: assign some random other source station to packets which have lost their source
|
11 years ago |