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.

Jonathan G Rennison a9515456cb Merge branch 'master' into jgrpp ... # Conflicts: # src/network/core/os_abstraction.h # src/network/core/tcp_content.h # src/network/core/udp.cpp # src/table/currency_settings.ini # src/table/settings.h.preamble		3 years ago
..
CMakeLists.txt	CMake: Fix host strgen/settingsgen importing	3 years ago
airport_defaults.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
airport_movement.h	…
airporttile_ids.h	…
airporttiles.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
animcursors.h	…
autorail.h	…
bridge_land.h	…
build_industry.h	Codechange: rename sound ids to make more sense. (#8701)	3 years ago
cargo_const.h	Cleanup: Rework the CargoSpec macro for improved readability.	4 years ago
clear_land.h	…
company_settings.ini	Merge branch 'master' into jgrpp	3 years ago
control_codes.h	Add timetable lateness/earliness conditional order	3 years ago
currency_settings.ini	Merge branch 'master' into jgrpp	3 years ago
darklight_colours.h	…
elrail_data.h	…
engines.h	Codechange: rename sound ids to make more sense. (#8701)	3 years ago
gameopt_settings.ini	Merge branch 'master' into jgrpp	3 years ago
genland.h	Fix: Desert/rainforest data coordinate 'y' is off by 1 when their 'x' coordinate is negative	3 years ago
heightmap_colours.h	…
industry_land.h	…
landscape_sprite.h	…
misc_settings.ini	Merge branch 'master' into jgrpp	3 years ago
newgrf_debug_data.h	Fix #248: Crash in debug window -> parent button for non-GRF industries	3 years ago
object_land.h	…
opengl_shader.h	Fix #8734: [OpenGL] Apply palette remap to cursor sprites. (#8742)	3 years ago
palette_convert.h	…
palettes.h	…
pricebase.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
railtypes.h	Fix PBS rail type handling with incorrect GRF rail type compatibility	4 years ago
road_land.h	Fix: front/back sprites of action5 tram catenary were swapped.	3 years ago
roadtypes.h	GRF: Add extra road/tram type flag: not available to AI/GS	4 years ago
roadveh_movement.h	…
settings.h.postamble	…
settings.h.preamble	Merge branch 'master' into jgrpp	3 years ago
settings.ini	Merge branch 'master' into jgrpp	3 years ago
sprites.h	Merge branch 'master' into jgrpp	3 years ago
station_land.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
strgen_tables.h	Merge branch 'master' into jgrpp	3 years ago
string_colours.h	…
town_land.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
townname.h	Merge branch 'master' into jgrpp	3 years ago
track_land.h	…
train_cmd.h	Codechange: Replace assert_compile macro with static_assert	4 years ago
tree_land.h	…
unicode.h	…
water_land.h	…
win32_settings.ini	Merge branch 'master' into jgrpp	3 years ago
window_settings.ini	Merge branch 'master' into jgrpp	3 years ago