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 86a6f63e2f Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/commit-checker.yml
#	.github/workflows/release-linux-legacy.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows-store.yml
#	.github/workflows/release-windows.yml
#	.github/workflows/upload-cdn.yml
#	.github/workflows/upload-gog.yml
#	.github/workflows/upload-steam.yml
#	src/console_cmds.cpp
#	src/core/math_func.hpp
#	src/fios.cpp
#	src/fios.h
#	src/intro_gui.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/settings_type.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/economy_settings.ini
#	src/table/settings/game_settings.ini
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/table/settings/locale_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/multimedia_settings.ini
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/table/settings/news_display_settings.ini
#	src/table/settings/old_gameopt_settings.ini
#	src/table/settings/pathfinding_settings.ini
#	src/table/settings/script_settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
#	src/table/settings/world_settings.ini
#	src/viewport.cpp
#	src/viewport_func.h
#	src/window.cpp
4 months ago
..
settings Merge branch 'master' into jgrpp 4 months ago
CMakeLists.txt Use compatibility table for loading non-table OPTS, PATS chunks 7 months ago
airport_defaults.h Split date types into calendar and economy dates 4 months ago
airport_movement.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h Split date types into calendar and economy dates 4 months ago
build_industry.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
cargo_const.h Codechange: cleanup CargoPacket in terms of variable/function names (#11278) 8 months ago
clear_land.h
control_codes.h Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
darklight_colours.h
elrail_data.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
engines.h Split date types into calendar and economy dates 4 months ago
genland.h
heightmap_colours.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
industry_land.h
landscape_sprite.h
newgrf_debug_data.h Split date types into calendar and economy dates 4 months ago
object_land.h Split date types into calendar and economy dates 4 months ago
opengl_shader.h
palette_convert.h
palettes.h
pricebase.h
railtypes.h Split date types into calendar and economy dates 4 months ago
road_land.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
roadtypes.h Split date types into calendar and economy dates 4 months ago
roadveh_movement.h
settings.h.postamble
settings.h.preamble Merge branch 'master' into jgrpp 4 months ago
settings_compat.h Use compatibility table for loading non-table OPTS, PATS chunks 7 months ago
sprites.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
station_land.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
strgen_tables.h Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
string_colours.h
town_land.h Split date types into calendar and economy dates 4 months ago
townname.h Merge branch 'master' into jgrpp 5 months ago
track_land.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
train_cmd.h
tree_land.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
unicode.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
water_land.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago