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
3 years ago
Jonathan G Rennison
4e0804b791
Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed
3 years ago
Jonathan G Rennison
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
Charles Pigott
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
SamuXarick
79d938b957
Fix 0125892: Warning about unsigned unary minus
3 years ago
SamuXarick
f84a466ca5
Fix #7945 : Add cost of clearing the sloped tile when placing a dock ( #7947 )
3 years ago
gooball
0125892f04
Fix #8297 : Infrastructure counters for road tunnels, bridges, depots … ( #8454 )
...
The previous fix 887e9481ff0e70df6bf93ce15a3899a03f124c50 only worked for roads and failed to consider a multiplier used for the infrastructure totals for tunnels/bridges.
Also, depots and bus/truck stops are counted as 2 road pieces on creation but were only counted as 1 road piece on conversion because the function DiagDirToRoadBits() was used, which only ever returns single-piece road segments.
Co-authored-by: A. S <admin-git@sotai.tk>
3 years ago
Pavel Stupnikov
f39a00d676
Feature: Set exclusive access to industry from GS ( #8115 )
...
(cherry picked from commit 9a45a0f535
)
4 years ago
glx22
d8605ad18d
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
4 years ago
Pavel Stupnikov
9a45a0f535
Feature: Set exclusive access to industry from GS ( #8115 )
4 years ago
Jonathan G Rennison
2ad446369d
Cache animated tile speed, use btree map for animated tiles
4 years ago
Jonathan G Rennison
ffe3c769a3
Add road tile cached one way state, one way road section detection
4 years ago
Jonathan G Rennison
3a75f13874
Allow drive-through road stops to be one-way
4 years ago
Jonathan G Rennison
67506e3781
Return error when upgrading airport to an identical configuration
...
See: #200
4 years ago
Jonathan G Rennison
3b49f892fa
Redraw connecting link graph overlay links when moving station sign
...
Add test console command
4 years ago
Jonathan G Rennison
c82d372d54
Reduce performance issues in DeleteStaleLinks with refit to any cargo
...
Remove redundant executions of LinkRefresher::Run
4 years ago
Jonathan G Rennison
d5ada6a14b
Add setting to control RV re-routing on road layout change
...
Default to road removal only
This is due to poor performance with many RVs when town growth is
continually adding to the road layout
4 years ago
Jonathan G Rennison
271fac01a7
Add setting to scale station cargo capacity and rating tolerance by size
4 years ago
Jonathan G Rennison
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
Michael Lutz
63ccb36ef3
Codechange: Use std::string for most of the user-settable custom names.
4 years ago
Jonathan G Rennison
d37d08ebb3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_func.h
4 years ago
dP
f2a9a1e2a5
Fix #8137 : New clients can't join (desync) after funding an industry
4 years ago
dP
7bd52970a1
Codechange: Refactor FindStationsAroundTiles to avoid code duplication
4 years ago
Jonathan G Rennison
a4bf068c6c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/toolbar_gui.cpp
4 years ago
glx
9339e4dcad
Fix #8081 : Check for waypoints when removing docking tiles
4 years ago
Jonathan G Rennison
ba65a79d09
Enable allowing/disallowing supply to a station, per cargo
...
Ctrl-click station cargo rating
4 years ago
Jonathan G Rennison
8fb0b638fa
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network.cpp
4 years ago
Jonathan G Rennison
7949de2c05
Add a minimum visible height and no ground tile parameter to DrawTileProc.
...
Filter out tile parts which are entirely outside the drawing area.
4 years ago
Jonathan G Rennison
4108672cf6
Use separate tile hash for each vehicle type
4 years ago
Jonathan G Rennison
f2bc12bb21
Avoid integer overflow in MoveGoodsToStation
...
In case where input cargo amount > 255
4 years ago
SamuXarick
ea7044a74b
Fix f5381798: Station::GetTileArea reduced docks to a single tile ( #8014 )
4 years ago
Jonathan G Rennison
70794644cc
Fix crash in distributing residual cargo in MoveGoodsToStation
4 years ago
Jonathan G Rennison
c42ce832ae
Fix viewport signs and text effects marking viewports dirty unnecessarily
...
* When at high zoom levels where the signs are not shown
* Where the sign type is disabled in the display options
4 years ago
Jonathan G Rennison
a44e937eb0
Fix 58433c76: Incorrect town noise level update on airport construction
4 years ago
Jonathan G Rennison
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
4 years ago
Niels Martin Hansen
3fcb240f8e
Fix d84b67e5: Station rating effects affecting too large area
4 years ago
Jonathan G Rennison
dd99fd646d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
4 years ago
Jonathan G Rennison
c3223903ed
Codechange: Cache resolved town, station and industry name strings
4 years ago
dP
1225693b9c
Feature: Improved logic of sharing industry production between 3 or more stations
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
4 years ago
Jonathan G Rennison
09a8eee9b4
Add tile to draw drive through stop tram type assertion message
5 years ago
SamuXarick
40605efd1c
Codechange: Use KDTree for AirportGetNearestTown ( #7424 )
5 years ago
glx
ee7a8eebca
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
5 years ago
glx
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
glx
9892d90b26
Codechange: Replace order related FOR_ALL with range-based for loops
5 years ago
glx
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
Jonathan G Rennison
fe9b024f1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/signs_cmd.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
# src/waypoint_cmd.cpp
5 years ago
Jonathan G Rennison
35dc377a58
Fix: Infrastructure total update when removing tram road stop
...
The wrong road owner was used when updating the tram infrastructure total.
This could result in desyncs, negative infrastructure totals, etc.
5 years ago
Jonathan G Rennison
3c23c558ac
Fix infrastructure total update when removing tram road stop
...
See: #89
5 years ago
Niels Martin Hansen
9900af38f5
Fix #7847 : Use ViewportSign coordinates for sign Kdtree coordinates ( #7849 )
...
Ensure the same coordinates are used for station/town/player signs regardless of how the landscape changes below it after the coordinates were first determined.
By keeping track of whether each ViewportSign is valid for Kdtree use (and only ever registering the viewport sign when the object is valid) a lot of code can be simplified and become more robust at the same time.
5 years ago
Jonathan G Rennison
2b0c1a5930
Separate allow stations under bridges into settings for: rail, road, docks
5 years ago
Jonathan G Rennison
252a690ac4
Fix use of station GRF disallowed bridge pillar flags.
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
ca3c72438e
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
5 years ago
Jonathan G Rennison
2be619ea88
Fix #7820 : Heap use after free when removing oil rig
5 years ago
Jonathan G Rennison
fe4fa46da3
Fix heap use after free when removing oil rig
5 years ago
Jonathan G Rennison
e7170463f0
Tidy up dead code in DeleteOilRig
5 years ago
Charles Pigott
2f4de0a0fe
Fix #7733 : Crash when removing a dock next to an industry without a station
5 years ago
Jonathan G Rennison
b6e9817edb
Link graph: Explicitly flag invalidated flow stats instead of minimising their flows
...
Entirely exclude invalidated flow stats from link stats
Delete invalidated flow stats if they stay invalid for 32 link graph jobs
This is to prevent large numbers of invalidated flow stats from
unduly influencing link statistics
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
170e71787b
Add console commands to dump station flow stats
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
1f535915d1
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
5 years ago
Jonathan G Rennison
6d10961318
Fix RemoveDockingTile when adjacent to industry without neutral station
5 years ago
Daniel Lee
2d9eb1c417
Fix #7626 : Allow building drive-through stops over one-way/blocked roads owned by towns (instead of crashing).
5 years ago
Juriy Petrochenkov
f0aea2d246
Fix: RemoveAirport function now returns with 'Aircraft in the way' error message as it should be.
5 years ago
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
2164eb4b12
Fix building of road stops on town-owned one-way roads
...
See: https://github.com/OpenTTD/OpenTTD/issues/7626
5 years ago
Jonathan G Rennison
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.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
ec2656ab7e
Codechange: Restrict docking points of docks.
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
Jonathan G Rennison
92c48d6897
Fix padded tile area being used for industries in FindStationsAroundTiles
5 years ago
Jonathan G Rennison
829c635add
Add road layout change counter, add to road veh path caches
...
Update layout counter when non-leaf road bits are added or removed
5 years ago
Jonathan G Rennison
f6b9395c6a
Improve performance of name sorting in town and station list windows
5 years ago
Jonathan G Rennison
512bb5ca4d
Use vehicle order destination map for HasStationInUse()
5 years ago
peter1138
402e18b460
Change: Allow building road stops over self-owned one-way/blocked road.
5 years ago
Niels Martin Hansen
d1ef13fc04
Fix #7481 : Just remove oil rig stations right away, don't clean them first
5 years ago
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
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
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# 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/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
Jonathan G Rennison
070160af40
Save point used when adding station to viewport kd tree, use for removal
5 years ago
kiwitreekor
bc9b47d2e5
Fix #6222 : Advanced sprite layout sometimes showed incorrect railtype ground tile
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
a4a3a6a630
Merge branch 'master' into jgrpp
5 years ago
PeterN
e1069eee05
Codechange: Check airport layout would fit within map bounds before iterating tiles. ( #7429 )
5 years ago
Jonathan G Rennison
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
PeterN
b6e3e30d86
Codechange: Distance between town and airport has already just been found, so use it. ( #7427 )
...
Previously the distance was thrown away, only to be expensively recalculated again.
5 years ago
PeterN
7fb77ff35a
Fix: Incorrect display of industry production around tiles. ( #7426 )
...
Display of industry production around tiles (as shown when placing a station)
did not take account of the station catchment changes, so still showed production
from an industry even if it was not covered by a tile.
This is fixed by making a set of nearby industries that are covered, instead of
looping over all possible industries.
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
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
Henry Wilson
297fd3dda3
Codechange: Replaced SmallVector::Include() with include()
5 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
Henry Wilson
ca2f33c6d0
Codechange: Replaced SmallVector::Erase() with std::vector::erase()
5 years ago
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
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
e3b85f617b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
5 years ago
peter1138
b00a861467
Codechange: Make FindStationsAroundTile() out-parameter stations const to prevent incorrect modification.
5 years ago
peter1138
6b92b83128
Fix #7372 : FindStationsAroundTiles() with caching returns no result for industry tiles.
...
Currently this can only be triggered by NewGRF house tiles querying for cargo acceptance history
of nearby stations (var 0x64) with a tile offset, and providing an offset that happens to point
to an industry tile. This serves no useful purpose.
5 years ago
Johannes E. Krause
ba3d7122df
Cleanup: Remove questionable syntax in station rating calculation
5 years ago
Jonathan G Rennison
290471c70f
Use btree_set for IndustryList and StationList
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
943c58e468
Fix: Show industry name in Land Area Information window for oil-rig type stations instead of just 'Oil Rig'
5 years ago
Peter Nelson
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
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
f34f329a53
Check that tile area is valid in CmdBuildRailStation
5 years ago
Jonathan G Rennison
635ee89b86
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
5 years ago
SamuXarick
456e67ac1c
Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations ( #7256 )
5 years ago
Jonathan G Rennison
36ac643749
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
5 years ago
Juanjo
45ce517105
Codechange: Move some common code after adding/removing tiles to a station to its own function.
5 years ago
Jonathan G Rennison
698409381e
Cache viewport station/waypoint sign infomation
5 years ago
Jonathan G Rennison
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
5 years ago
Peter Nelson
81330b8d6e
Change: Add path cache for ships.
5 years ago
Jonathan G Rennison
08998d95ba
De-virtualise tile animation calls
5 years ago
nikolas
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
5 years ago
Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
Johannes E. Krause
06cd561cea
Add: when placing non-rectangular airport, consider airport tile table tiles only (patch by adf88, #6613 )
5 years ago
Jonathan G Rennison
8b37e5aac2
Implement custom bridge pillar flag support
...
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars
Set values for default bridges and stations
6 years ago
Jonathan G Rennison
6df12e77b6
Refactor/de-duplicate rail station bridge above check methods
6 years ago
Jonathan G Rennison
beaddc8a98
Set minimum bridge height clearances for default stations
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
Joost Hopmans
5029cd6f28
Fix: Only possible to build station next to competitors by using CTRL+click
...
Fix by checking only for stations owned by the current company when
inspecting if there are multiple adjoining stations to the one being built.
When building next to 2 or more owned stations we don't know which
station should be extended. For other companies' stations that's not a
problem since our station won't merge with theirs anyway.
Calling to BuildStationPart should never have another company's station
as a parameter to attach to unless the client is malicious, so just returning
a generic error in that case.
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
Jonathan G Rennison
ef0a0b0f8e
Implement rail station property 1B, bridge clearance information
6 years ago
Jonathan G Rennison
76a7b70cad
Implement NewGRF Station var 0x42 (rail type) for unbuilt stations
6 years ago
Jonathan G Rennison
b9d7f8e0a7
Disallow building bridges over airports
6 years ago
Jonathan G Rennison
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Peter Nelson
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
6 years ago
Jonathan G Rennison
4bdbf3863d
Add setting to allow placing stations under bridges
6 years ago
Jonathan G Rennison
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
Peter Nelson
408cee123d
Fix: One-way roads could be over-built by road stops (regardless of road owner.)
6 years ago
Jonathan G Rennison
d2d8a86814
Add setting: station rating waiting time tolerance depends on cargo class
6 years ago
Jonathan G Rennison
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
PeterN
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
Jonathan G Rennison
793a446062
Zoning: Ensure that screen is refreshed when necessary in authority overlay
6 years ago
Jonathan G Rennison
2821599f6b
Better handle out of track and depot through load cases
...
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
6 years ago
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
6 years ago