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 42c8f50551 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # .gitignore # COMPILING.md # src/company_gui.cpp # src/date_gui.cpp # src/engine.cpp # src/engine_func.h # src/fileio.cpp # src/linkgraph/linkgraph_gui.h # src/newgrf_debug_gui.cpp # src/newgrf_gui.cpp # src/order_gui.cpp # src/osk_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/script/api/script_event_types.hpp # src/sl/oldloader_sl.cpp # src/smallmap_gui.cpp # src/station_cmd.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/transparency_gui.cpp # src/vehicle_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_func.h # src/widgets/dropdown_type.h # src/widgets/group_widget.h # src/widgets/vehicle_widget.h # src/window.cpp # src/window_gui.h # src/window_type.h		5 months ago
..
CMakeLists.txt	Split save/load settings into separate INI files	6 months ago
company_settings.ini	Change minimum value for auto_timetable_separation_rate setting	5 months ago
currency_settings.ini	Split save/load settings into separate INI files	6 months ago
difficulty_settings.ini	Split save/load settings into separate INI files	6 months ago
economy_settings.ini	Split save/load settings into separate INI files	6 months ago
game_settings.ini	Split save/load settings into separate INI files	6 months ago
gui_settings.ini	Merge branch 'master' into jgrpp	5 months ago
linkgraph_settings.ini	Split save/load settings into separate INI files	6 months ago
locale_settings.ini	Split save/load settings into separate INI files	6 months ago
misc_settings.ini	Merge branch 'master' into jgrpp	6 months ago
multimedia_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	6 months ago
network_private_settings.ini	Settings: Only write out config on setting change for persistent changes	9 months ago
network_secrets_settings.ini	Settings: Only write out config on setting change for persistent changes	9 months ago
network_settings.ini	Split save/load settings into separate INI files	6 months ago
news_display_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	6 months ago
old_gameopt_settings.ini	Split save/load settings into separate INI files	6 months ago
pathfinding_settings.ini	Merge branch 'master' into jgrpp	5 months ago
scenario_settings.ini	Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH	6 months ago
script_settings.ini	Split save/load settings into separate INI files	6 months ago
win32_settings.ini	…
window_settings.ini	Fix window preference save/load of build vehicle windows	2 years ago
world_settings.ini	Add setting for map edge behaviour, and how to display area outside map	5 months ago