ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
1 year ago
3323402aaa
Codechange: rename smallvec_type to container_func and use only when needed
1 year ago
90abfff45c
Fix adjacent level crossings left barred after removing middle of crossing
...
See: #517
1 year ago
7aa2b9ab0a
Codechange: move all date-related variables inside the timer ( #10706 )
1 year ago
9521e7ef2b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/elrail.cpp
# src/ground_vehicle.hpp
# src/landscape.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnelbridge_cmd.cpp
1 year ago
e8af8daa68
Codechange: pass "ground vehicle" to GetTileSlopeZ since for tunnel/bridges there are two states
...
Previously it checked the position in non-driving direction to "guess" whether
a ground vehicle was using the function, so on tunnels/bridges it could either
return the Z of the (virtual) ground compared to the Z of the path the vehicle
would take.
1 year ago
48d602962f
Road stops: Add inferred one way road state to var 50/roadstop_misc_info
1 year ago
983790ec7a
Remove unused town argument from GetTownRoadType
1 year ago
4ec6a99dd8
Add GetTileTrackStatus wrapper for when red signals part is not needed
1 year ago
ae7c86c49d
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# src/industry_cmd.cpp
# src/industry_cmd.h
# src/network/core/http_curl.cpp
# src/network/core/tcp_http.cpp
# src/network/core/tcp_http.h
# src/network/network_content.h
# src/script/api/script_goal.cpp
# src/script/api/script_industry.cpp
# src/script/api/script_league.cpp
# src/script/api/script_story_page.cpp
# src/script/api/script_town.cpp
# src/train.h
# src/train_cmd.cpp
1 year ago
b52b29b1a4
Change: Avoid crashing to the side of a train
...
When a road vehicle is already running on a multi level crossing, and a train shows up ahead, don't make the road vehicle crash on the side of the train.
1 year ago
f7d62a1767
Add road/tram type flag to disallow collisions with trains
1 year ago
663a3969a0
Add road/tram type flag to disallow tunnels
1 year ago
3497d0dcdb
Add road/tram type properties to set road vehicle collision mode
1 year ago
483e3172af
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
1 year ago
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
fe2bcd2a58
Codechange: migrate size related functions to Map structure
1 year ago
5b490b243d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
# src/landscape.cpp
# src/object_cmd.cpp
# src/rail_cmd.cpp
# src/script/api/script_tile.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/world_settings.ini
# src/terraform_cmd.cpp
# src/tilearea_type.h
# src/tree_cmd.cpp
# src/tree_cmd.h
# src/tree_gui.cpp
# src/water_cmd.cpp
1 year ago
b35c791d05
Codechange: use smart pointers when cloning iterators
1 year ago
64c210f770
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/group_gui.cpp
# src/lang/english.txt
# src/newgrf.cpp
# src/saveload/oldloader_sl.cpp
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
2 years ago
6caed5f15e
Add: Slope-aware and roadtype-specific one-way sprites. ( #10282 )
2 years ago
8af4ac8a4c
GRF: Add road stops variable for road info of nearby plain road tile
...
See: #464
2 years ago
3435e74c0c
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# os/macosx/Info.plist.in
# src/fileio.cpp
# src/landscape.cpp
# src/league_cmd.h
# src/saveload/ai_sl.cpp
# src/saveload/game_sl.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.cpp
2 years ago
c50fabb574
Fix #10208 : allow to use specific underlay for road/tram tunnels ( #10233 )
2 years ago
c719ba560e
Fix 03cc0d6: Mark level crossings dirty when removing road from them, not from bridges ( #10138 )
2 years ago
4b08874583
Only show edge level crossing overlays even when safer crossings is off
2 years ago
c19abebf8d
Feature: Multi-track level crossings ( #9931 )
2 years ago
8e6ed8d5e9
Fix db98cedb: Swap the tile parameter validation around as only the first TileIndex is automatically validated.
2 years ago
db98cedb7e
Fix #9883 : Show cost/income float over end tile of rail or road construction
2 years ago
846cd7e228
Add setting to limit length of continuous inclined roads built by towns
...
Default to max 4 tiles
2 years ago
143230d8f2
Allow changing road vehicle driving side when all road vehicles in depots
2 years ago
10b415bf10
Level crossings: Clarify adjacent blocked crossing track status handler
...
Avoid unnecessary adjacent tile checks if crossing is not blocked
2 years ago
e9f6559d36
Merge branch 'pr-384' into jgrpp
2 years ago
114bed4549
Fix z-check for flat road foundations
2 years ago
ad0dc6dc87
Add road stops flag to disable drawing catenary
2 years ago
34af4844d1
Merge branch 'master' into jgrpp
2 years ago
8d54f76539
Fix #9837 , 46bd2f1c: Road build with wrong half-tile ends.
2 years ago
68ec2a7877
Fix: removing long roads doesn't prioritize refusal of local authority over other errors ( #9831 )
2 years ago
d9a37c915f
Cleanup #9725 : Replace cmd_helper related functions and remove cmd_helper.h.
2 years ago
70a65ac1c0
Road waypoints no longer block road inferred one-way state interpolation
2 years ago
ad9c85ad3c
Fix crash when changing one-way state of road waypoints
2 years ago
c3c55db02b
Implement road ground types for road waypoints
2 years ago
b4fc0b4dc5
Initial implementation of road waypoints
2 years ago
2e39637db2
Codechange: Don't use a global for the 'not enough cash' message.
3 years ago
c6d7b98808
Codechange: Un-bitstuff landscape commands.
3 years ago
46bd2f1ced
Codechange: Un-bitstuff remaining transport infrastructure commands.
3 years ago
55170ae703
Codechange: Un-bitstuff rail commands.
3 years ago
6fe445e6c0
Codechange: Un-bitstuff station/depot/waypoint commands.
3 years ago
e740c24eb7
Codechange: Template DoCommand to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
3 years ago
7048e1522f
Codechange: Move flags in CommandProc in front of the command arguments.
3 years ago
Jonathan G Rennison
Rubidium
Patric Stout
SamuXarick
Francis Herne
Loïc Guilloux
Tyler Trahan
Michael Lutz
Andreas Schmitt
J0anJosep