Jonathan G Rennison
d3e0c3787f
Merge branch 'master' into jgrpp-nrt
...
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
5 years ago
Jonathan G Rennison
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
Jonathan G Rennison
601afc56dc
Add NewGRF debug window info for stations and industries
5 years ago
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
Jonathan G Rennison
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
6 years ago
PeterN
671a310d21
Fix #7235 : Ensure catchment area of neutral station covers entire industry. ( #7518 )
6 years ago
Jonathan G Rennison
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
6 years ago
PeterN
abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() ( #7467 )
6 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
070160af40
Save point used when adding station to viewport kd tree, use for removal
6 years ago
Jonathan G Rennison
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
6 years ago
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
6 years ago
Niels Martin Hansen
ce10d9be3f
Fix #7374 : Ensure k-d trees are always updated when station sign moves
6 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
6 years ago
Niels Martin Hansen
e8d397e4ee
Codechange: Make a merged k-d tree index of all viewport signs
6 years ago
Niels Martin Hansen
d84b67e54d
Codechange: Make a k-d tree index of stations
6 years ago
Peter Nelson
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
6 years ago
peter1138
94b40fd530
Codechange: Convert IndustryVector to a std::set.
6 years ago
peter1138
ed6084523d
Codechange: Convert StationList from SmallVector to std::set.
6 years ago
PeterN
dd20ccee88
Feature: Industries with neutral stations (e.g. Oil Rig) only supply/accept cargo to/from their neutral station. ( #7234 )
...
This change is a controlled by a game setting, located under Environment ->
Industries which allows toggling the behaviour. It defaults to enabled.
"Company stations can serve industries with attached neutral stations"
When enabled, industries with attached neutral station (such as Oil Rigs) may
also be served by company-owned stations built nearby. This is the traditional
behaviour.
When disabled, these industries may only be served by their neutral station.
Any nearby company-owned stations won't be able to serve them, nor will the
neutral station serve anything else other than the industry.
6 years ago
Jonathan G Rennison
e6ee962b03
Fix ship collision avoidance near docks when dock not under station sign
...
See #77
6 years ago
Jonathan G Rennison
698409381e
Cache viewport station/waypoint sign infomation
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Jonathan G Rennison
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
Charles Pigott
86012e10ea
Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method
7 years ago
Jonathan G Rennison
955126efac
Improve pathfinder support for multiple docks
...
The pathfinder can now find docks other than the Manhattan closest one.
Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
7 years ago
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
Jonathan G Rennison
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
Jonathan G Rennison
c6cbe7f1a9
Merge branch 'departure-boards-sx' into jgrpp
9 years ago
Jonathan G Rennison
0529250e50
Fix crash when a station is deleted with the departure boards window open.
9 years ago
Jonathan G Rennison
196b78af30
Merge branch 'zoning' into jgrpp
9 years ago
Jonathan G Rennison
c120b810d1
Mark dirty the catchment of a station on change as necessary for zoning.
...
If the zoning mode is station catchment, or unserved industry/building,
mark dirty the station catchment rectangle before removing, or after
adding, (a) station tile(s).
In the case of unserved industry mode, increase the refreshed catchment
radius by 10 tiles, to wholly include industries partially inside
the catchment area.
9 years ago
Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison
ffed0c194a
Add current order (station, waypoint or depot) condition variable.
...
Adjust item bit allocations:
* Increase cond flags from 2 bits to 3 bits, for future expansion.
* Use 2 bits remaining in adjacent gap for an auxiliary type field.
This is used for the type (station, waypoint, etc.) of order tests.
Perform a linear scan of the program pool when deleting a station,
waypoint or depot.
9 years ago
frosch
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
10 years ago
frosch
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
10 years ago
rubidium
09f6c46d0b
(svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed)
10 years ago
rubidium
e811fa1718
(svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed)
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
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
fonsinchen
4b726930f1
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
fonsinchen
46590e112e
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
fonsinchen
b31a1119fb
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
fonsinchen
91407b924e
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
fonsinchen
b908128ffb
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
fonsinchen
dffc4d411e
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
fonsinchen
5733569153
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
11 years ago
fonsinchen
930c19dae2
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
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
fonsinchen
9f49617eed
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
fonsinchen
5c8ff0a251
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
fonsinchen
c45cfa22a6
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
fonsinchen
db671ffb86
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
rubidium
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
rubidium
3947453277
(svn r25259) -Codechange: track capacities and usage of links
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
rubidium
2795ed5b09
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
alberth
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
alberth
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
michi_cc
fc8633e1ac
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
michi_cc
d3b7b89493
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
rubidium
bec64ece5a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
rubidium
fb63543e2a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
terkhen
7e0daae1ec
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
terkhen
00e5c1df18
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
rubidium
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
rubidium
5a620d1c65
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
smatz
c85e1c3089
(svn r22116) -Codechange: use PoolBase::Clean() at more places
14 years ago
smatz
756cc6cf65
(svn r22116) -Codechange: use PoolBase::Clean() at more places
14 years ago
rubidium
7e4ff17e35
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
14 years ago
rubidium
68bc93f950
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
14 years ago
rubidium
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
rubidium
faf5d899f7
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
rubidium
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
rubidium
9ca4b629cd
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
rubidium
508f7816dc
(svn r21483) -Codechange: make StationRect::ScanForStationTiles make use of TILE_AREA_LOOP. Making use of make makes me making use of my brain to determine whether I make use of tautology, or make use of pleonasm, or make use of both, or even make use of neither
14 years ago
rubidium
15b4941401
(svn r21483) -Codechange: make StationRect::ScanForStationTiles make use of TILE_AREA_LOOP. Making use of make makes me making use of my brain to determine whether I make use of tautology, or make use of pleonasm, or make use of both, or even make use of neither
14 years ago
alberth
9f3845227e
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
alberth
ab50f74d7f
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
rubidium
86a3fbb287
(svn r20774) -Fix [FS#4116]: assertion triggered when removing a station owned by nobody when the local company is "spectator" as well
14 years ago
rubidium
64d9a36dc0
(svn r20774) -Fix [FS#4116]: assertion triggered when removing a station owned by nobody when the local company is "spectator" as well
14 years ago
rubidium
1664ac1eb5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
rubidium
f5128695c5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
frosch
c18839704b
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
frosch
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
smatz
ba43c0f5dd
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
15 years ago
smatz
e71fd4bb57
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
15 years ago
smatz
a6232ad532
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
15 years ago