You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/table
Jonathan G Rennison 5b7db9d849 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
2 years ago
..
settings Merge branch 'master' into jgrpp 2 years ago
CMakeLists.txt Codechange: Let the compile generate the master command table out of templated command traits. 2 years ago
airport_defaults.h
airport_movement.h
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h
build_industry.h
cargo_const.h Codechange: Remove CargoSpec::multipliertowngrowth which is unused (#9701) 3 years ago
clear_land.h
control_codes.h Add a STRING8 format code 3 years ago
darklight_colours.h
elrail_data.h
engines.h Feature: [NewGRF] Maximum curve speed modifier for rail vehicles (#9346) 3 years ago
genland.h Reduce duplication in desert or rainforeset data search arrays 2 years ago
heightmap_colours.h
industry_land.h
landscape_sprite.h
newgrf_debug_data.h Merge branch 'master' into jgrpp 2 years ago
object_land.h Add NewGRF object properties to set viewport map mode/smallmap tile type 2 years ago
opengl_shader.h
palette_convert.h
palettes.h
pricebase.h
railtypes.h Add implementation of multi-aspect signalling and GRF support 3 years ago
road_land.h Only show level crossing overlay sprites on outsides of multi-track crossings 3 years ago
roadtypes.h
roadveh_movement.h
settings.h.postamble
settings.h.preamble Merge branch 'master' into jgrpp-beta 3 years ago
sprites.h Add replacement sprites for road waypoint buildings 2 years ago
station_land.h Add replacement sprites for road waypoint buildings 2 years ago
strgen_tables.h Merge branch 'master' into jgrpp 2 years ago
string_colours.h
town_land.h
townname.h Merge branch 'master' into jgrpp 2 years ago
track_land.h
train_cmd.h Codechange: Let the compile generate the master command table out of templated command traits. 2 years ago
tree_land.h
unicode.h
water_land.h