Jonathan G Rennison
|
a94a8da990
|
Suppress warning about using operator ^ on bool
|
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.
|
5 years ago |
Jonathan G Rennison
|
8956b1ab02
|
Improve performance of tunnel rendering in viewport map mode
|
5 years ago |
Jonathan G Rennison
|
99e0229860
|
Merge branch 'master' into jgrpp
|
5 years ago |
Niels Martin Hansen
|
45838d0105
|
Fix #7958: Use NewGRF provided catenary sprites when either front or back is overridden
|
5 years ago |
Niels Martin Hansen
|
9e4eee1b9e
|
Codechange: Refactor road bridge catenary drawing
|
5 years ago |
Jonathan G Rennison
|
76f68c48f5
|
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
|
5 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 |
Charles Pigott
|
ab9042145e
|
Fix #6667: Also recalculate bridge costs for 'spectated' AI companies
|
5 years ago |
Jonathan G Rennison
|
2b0c1a5930
|
Separate allow stations under bridges into settings for: rail, road, docks
|
5 years ago |
Jonathan G Rennison
|
acc946f505
|
Always allow buoys under bridges
|
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
|
8a01fba216
|
Fix crash in GetTileDesc_TunnelBridge on non-road bridges
|
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
|
7555cf2965
|
Fix road vehicles being unable to enter bridge at custom bridge head
Type mismatch
|
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
|
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 |
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
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
|
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 |
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
6 years ago |
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
6 years ago |
Jonathan G Rennison
|
e15601e12f
|
Cache whether a train may have a depot or bridge speed restriction
|
6 years ago |
Jonathan G Rennison
|
0e7519f33e
|
Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
|
6 years ago |
Niels Martin Hansen
|
b8b6954fb5
|
Fix 6a3d411: Silence truncation warning
|
6 years ago |
Jonathan G Rennison
|
70020e1a5c
|
Fix incorrect accounting of rail tunnel/bridge infrastructure counts
Regression from dual rail types change
|
6 years ago |
Jonathan G Rennison
|
65b9a103ad
|
Initial implementation of two rail types per tile
|
6 years ago |
Jonathan G Rennison
|
df0aa2ed4b
|
Add pillar and station height checks to bridge upgrade command
|
6 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 |
Charles Pigott
|
1778b2d66e
|
Codechange: Merge some duplicated functions
|
6 years ago |
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
Jonathan G Rennison
|
ef0a0b0f8e
|
Implement rail station property 1B, bridge clearance information
|
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 |
Peter Nelson
|
bf8d7df736
|
Change: Extend rail types to 64 (6 bit storage)
|
6 years ago |
Jonathan G Rennison
|
035f5622b9
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
|
6 years ago |
Jonathan G Rennison
|
4bdbf3863d
|
Add setting to allow placing stations under bridges
|
6 years ago |
Jonathan G Rennison
|
56bde8ce18
|
Add setting to allow placing all NewGRF objects under bridges
|
6 years ago |
Jonathan G Rennison
|
6a3d411fa1
|
Fix: Use after free in CmdBuildTunnel (#6856)
Use after free could occur when when excavating far end
removed multiple NewGRF objects
|
6 years ago |
Jonathan G Rennison
|
42505f3532
|
Merge branch 'custom_bridgeheads' into jgrpp
|
6 years ago |
Jonathan G Rennison
|
176fd2180b
|
Fix regression preventing road vehicles from leaving tunnels
|
6 years ago |
Jonathan G Rennison
|
6740a9a470
|
Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
|
6 years ago |
Jonathan G Rennison
|
77362b829a
|
Initial support for rail custom bridge heads
|
6 years ago |
Jonathan G Rennison
|
79ca5c8b7d
|
Merge branch 'custom_bridgeheads' into jgrpp
|
6 years ago |
Jonathan G Rennison
|
25af12814b
|
Fix double-adding of road tunnel/bridge infra counts when changing owner
|
6 years ago |
Jonathan G Rennison
|
670ed0de5b
|
Fix double-accounting of bidi signals on bridge/tunnel during owner change
|
6 years ago |
Jonathan G Rennison
|
e82ccad052
|
Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
|
6 years ago |
Jonathan G Rennison
|
814f9f7e0f
|
Implement bidirectional mode for signals on bridges/tunnels
|
6 years ago |
Jonathan G Rennison
|
d03139b241
|
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
|
6 years ago |
Jonathan G Rennison
|
b7ce21038a
|
Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
# src/tunnelbridge_cmd.cpp
|
7 years ago |
Jonathan G Rennison
|
1911c0cb69
|
Fix handling of custom bridge head ramp-only pieces/types when upgrading
|
7 years ago |
Jonathan G Rennison
|
c053549144
|
Merge branch 'signal_tunnels_bridges' into jgrpp
|
7 years ago |
Jonathan G Rennison
|
c92a28a072
|
Preserve signal simulation/reservation data when upgrading bridges.
Based on commit 301925f948c9b36966c9c668e1476c2485425338
|
7 years ago |
Jonathan G Rennison
|
714b9711e4
|
Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
# src/tunnelbridge_cmd.cpp
|
7 years ago |
Jonathan G Rennison
|
ff6a3ed234
|
Preserve custom bridge head road data when upgrading bridges.
Based on commit 301925f948c9b36966c9c668e1476c2485425338
|
7 years ago |
Jonathan G Rennison
|
e138d3564b
|
Fix tram reversing on custom bridge head tiles.
(cherry picked from commit 0a345efc27 )
|
7 years ago |
Jonathan G Rennison
|
102c55bc57
|
Fix assertion failure when trams do a short turnaround in a tunnel mouth
|
7 years ago |
Jonathan G Rennison
|
0a345efc27
|
Fix tram reversing on custom bridge head tiles.
|
7 years ago |
Jonathan G Rennison
|
95e8bc67cc
|
Merge branch 'chunnel' into jgrpp
|
7 years ago |
HackaLittleBit
|
60345d2e18
|
Fix cost of building tunnels.
|
7 years ago |
Jonathan G Rennison
|
4d21d6f81c
|
Merge branch 'chunnel' into jgrpp
|
8 years ago |
HackaLittleBit
|
eddd635f00
|
Chunnel: Make error reporting consistent with tunnel length reporting at cursor.
Error reporting should be in tune with occurrence of events.
|
8 years ago |
Jonathan G Rennison
|
612c825bb6
|
Chunnel: Minor whitespace/scope changes, rename function.
|
8 years ago |
HackaLittleBit
|
2549def764
|
Chunnel: Use separate container function for chunnel related conditions.
|
8 years ago |
Jonathan G Rennison
|
0d4bf16f57
|
Merge branch 'custom_bridgeheads' into jgrpp
|
8 years ago |
Jonathan G Rennison
|
57a5f08687
|
Fix handling of custom bridge heads on steep slopes.
|
8 years ago |
HackaLittleBit
|
de24fed9d1
|
Chunnel: Tunnels are only allowed to cross sea.
|
8 years ago |
Jonathan G Rennison
|
93a43da809
|
Chunnel: Prevent chunnels from intersecting with each other.
|
8 years ago |
Jonathan G Rennison
|
4c9f7b73b3
|
Chunnel: Add a ground veh flag for (maybe) being in a chunnel
Use this to avoid inclination change code in non-chunnel wormholes.
|
8 years ago |
Jonathan G Rennison
|
500ef49694
|
Chunnel: Double cost of building and removing chunnels.
|
8 years ago |
Jonathan G Rennison
|
89a0a9c182
|
Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format.
|
8 years ago |
Jonathan G Rennison
|
212f6ce6ef
|
Chunnel: Add setting to enable construction, default off.
|
8 years ago |
Jonathan G Rennison
|
02b33e7f64
|
Chunnel: Add error text for too many tunnels.
|
8 years ago |
Jonathan G Rennison
|
aac5b2d4ad
|
Chunnel: Adjust struct Tunnel constructor
|
8 years ago |
Jonathan G Rennison
|
21bbb42d7e
|
Chunnel: Adjust arguments of IsTunnelInWay
|
8 years ago |
HackaLittleBit
|
7e6215f271
|
Chunnel patch 28401: Add: Tile description chunnel.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
|
8 years ago |
HackaLittleBit
|
15c8e67655
|
Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
|
8 years ago |
HackaLittleBit
|
1ac8f66de1
|
Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
8 years ago |
HackaLittleBit
|
dfce9cc4c0
|
Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
8 years ago |
HackaLittleBit
|
dee526c6d6
|
Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
8 years ago |
HackaLittleBit
|
f7ced74c22
|
Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
8 years ago |
HackaLittleBit
|
ad070b91ea
|
Chunnel patch 28392: Add: Basic tunnel pool. (no save)
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
8 years ago |
Jonathan G Rennison
|
091c30e254
|
Merge branch 'custom_bridgeheads' into jgrpp
|
8 years ago |
Jonathan G Rennison
|
c6fa52f1f1
|
Fix wrong calculation of road tunnel infrastructure counts.
|
8 years ago |
Jonathan G Rennison
|
4550ac39b9
|
Merge branch 'signal_tunnels_bridges' into jgrpp
|
8 years ago |
Jonathan G Rennison
|
e1ee952b85
|
Fix crash when updating infrastructure totals when deleting bridge with signals.
|
8 years ago |
Jonathan G Rennison
|
072915f2c7
|
Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
|
8 years ago |
Jonathan G Rennison
|
da177d063f
|
Custom bridge heads: Initial implementation
|
8 years ago |
Jonathan G Rennison
|
1e5c788541
|
Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
|
8 years ago |
Jonathan G Rennison
|
d762835903
|
Signals on tunnel/bridges are now added to infrastructure stats.
|
8 years ago |
Jonathan G Rennison
|
074555e41d
|
Merge branch 'save_ext' into signal_tunnels_bridges
|
8 years ago |
Jonathan G Rennison
|
478ff2538e
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/lang/korean.txt
|
8 years ago |