Jonathan G Rennison
|
43980639de
|
Merge branch 'master' into jgrpp
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
|
3 years ago |
|
Jonathan G Rennison
|
ed0ffb6220
|
Add feature: realistic train braking
Add setting to select train braking model.
|
3 years ago |
|
Jonathan G Rennison
|
2a82491a2e
|
Fix reservation not cleared from far end of signalled tunnel when removing
|
3 years ago |
|
Jonathan G Rennison
|
65d5d13a08
|
Avoid unnecessary viewport redrawing when (un)reserving signalled bridges
|
3 years ago |
Michael Lutz
|
79240eab1e
|
Codechange: Make use of the improved C++17 emplace_back function.
|
4 years ago |
|
Jonathan G Rennison
|
9efeb3551a
|
Tunnel/bridge signal simulation spacing is now a company setting
|
4 years ago |
|
Jonathan G Rennison
|
7381e00859
|
DEBUG: Add bridge pillar index to debug landinfo print
|
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
|
946442ab6b
|
GRF: Add extra road/tram type flag: towns cannot modify tiles
|
4 years ago |
|
Jonathan G Rennison
|
0fc0baddff
|
Add bridge info to landinfo window debug print
|
4 years ago |
|
Jonathan G Rennison
|
14adcbac80
|
Add NewGRF bridge property to prevent town or AI/GS building bridge type
|
4 years ago |
|
Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
4 years ago |
|
Jonathan G Rennison
|
a0f78a8071
|
Fix assertion failure when upgrading dual road/tram bridge
In case where the other road/tram type does not extend across
the bridge, but is present on the upgrade tile.
|
4 years ago |
|
Jonathan G Rennison
|
810bfd276e
|
Add several NewGRF variables to vehicle image callback whitelist
Add vehicle flags to control cached image invalidation
Various refactorings
|
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
|
3adeff1883
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
|
4 years ago |
ilayaraja97
|
cf8ccf4b08
|
Fix #8131: small bridges also have pillars drawn
|
4 years ago |
|
Jonathan G Rennison
|
ea06a0670d
|
Add rail ground type support for rail custom bridge heads
See: #146
|
4 years ago |
|
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.
|
4 years ago |
|
Jonathan G Rennison
|
8956b1ab02
|
Improve performance of tunnel rendering in viewport map mode
|
4 years ago |
|
Jonathan G Rennison
|
99e0229860
|
Merge branch 'master' into jgrpp
|
4 years ago |
Niels Martin Hansen
|
45838d0105
|
Fix #7958: Use NewGRF provided catenary sprites when either front or back is overridden
|
4 years ago |
|
Niels Martin Hansen
|
9e4eee1b9e
|
Codechange: Refactor road bridge catenary drawing
|
4 years ago |
|
Jonathan G Rennison
|
76f68c48f5
|
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
|
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 |
Charles Pigott
|
ab9042145e
|
Fix #6667: Also recalculate bridge costs for 'spectated' AI companies
|
4 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
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
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
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
5 years ago |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
5 years ago |
|
Jonathan G Rennison
|
e15601e12f
|
Cache whether a train may have a depot or bridge speed restriction
|
5 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
|
5 years ago |
|
Niels Martin Hansen
|
b8b6954fb5
|
Fix 6a3d411: Silence truncation warning
|
5 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 |