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 cfebbfac8c Merge branch 'master' into jgrpp ... # Conflicts: # src/autoreplace_cmd.cpp # src/company_base.h # src/company_gui.cpp # src/cpu.cpp # src/debug.h # src/group.h # src/group_cmd.cpp # src/house.h # src/industry.h # src/newgrf_house.cpp # src/news_type.h # src/openttd.cpp # src/saveload/company_sl.cpp # src/settings_type.h # src/sl/oldloader_sl.cpp # src/story.cpp # src/table/town_land.h # src/viewport.cpp		4 months ago
..
CMakeLists.txt	Split save/load settings into separate INI files	7 months ago
company_settings.ini	Change minimum value for auto_timetable_separation_rate setting	6 months ago
currency_settings.ini	Split save/load settings into separate INI files	7 months ago
difficulty_settings.ini	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
economy_settings.ini	Add settings for town/industry cargo production scaling modes	5 months ago
game_settings.ini	Merge branch 'master' into jgrpp	4 months ago
gui_settings.ini	Merge branch 'master' into jgrpp	5 months ago
linkgraph_settings.ini	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
locale_settings.ini	Merge branch 'master' into jgrpp	5 months ago
misc_settings.ini	Merge branch 'master' into jgrpp	5 months ago
multimedia_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	7 months ago
network_private_settings.ini	Settings: Only write out config on setting change for persistent changes	10 months ago
network_secrets_settings.ini	Settings: Only write out config on setting change for persistent changes	10 months ago
network_settings.ini	Split save/load settings into separate INI files	7 months ago
news_display_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	7 months ago
old_gameopt_settings.ini	Split save/load settings into separate INI files	7 months ago
pathfinding_settings.ini	Add setting text/warnings about why YAPF is recommended for trains	5 months ago
scenario_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	7 months ago
script_settings.ini	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
win32_settings.ini	…
window_settings.ini	…
world_settings.ini	Fix enabling map edge mode setting when void edge tiles were not flat	5 months ago