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
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
5 years ago
PeterN
671a310d21
Fix #7235 : Ensure catchment area of neutral station covers entire industry. ( #7518 )
5 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
5 years ago
PeterN
abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() ( #7467 )
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
070160af40
Save point used when adding station to viewport kd tree, use for removal
5 years ago
Jonathan G Rennison
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
5 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
5 years ago
Niels Martin Hansen
ce10d9be3f
Fix #7374 : Ensure k-d trees are always updated when station sign moves
5 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
5 years ago
Niels Martin Hansen
e8d397e4ee
Codechange: Make a merged k-d tree index of all viewport signs
5 years ago
Niels Martin Hansen
d84b67e54d
Codechange: Make a k-d tree index of stations
5 years ago
Peter Nelson
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
5 years ago
peter1138
94b40fd530
Codechange: Convert IndustryVector to a std::set.
5 years ago
peter1138
ed6084523d
Codechange: Convert StationList from SmallVector to std::set.
5 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.
5 years ago
Jonathan G Rennison
e6ee962b03
Fix ship collision avoidance near docks when dock not under station sign
...
See #77
5 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
6 years ago
Charles Pigott
86012e10ea
Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method
6 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
6 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.
9 years ago
frosch
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 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
10 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
10 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