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 0150f8f570 Merge branch 'master' into jgrpp ... # Conflicts: # src/network/network_server.cpp		1 month ago
..
CMakeLists.txt	Split save/load settings into separate INI files	7 months ago
company_settings.ini	Merge branch 'master' into jgrpp	4 months ago
currency_settings.ini	Revert #11993: new number format system does not and cannot work for CJK languages	3 months ago
difficulty_settings.ini	Merge branch 'master' into jgrpp	3 months ago
economy_settings.ini	Add setting to only spawn primary industries	3 months ago
game_settings.ini	Merge branch 'master' into jgrpp	4 months ago
gui_settings.ini	Merge branch 'master' into jgrpp	1 month ago
linkgraph_settings.ini	Merge branch 'master' into jgrpp	4 months ago
locale_settings.ini	Merge branch 'master' into jgrpp	3 months ago
misc_settings.ini	Merge branch 'master' into jgrpp	4 months ago
multimedia_settings.ini	Merge branch 'master' into jgrpp	4 months ago
network_private_settings.ini	Merge branch 'master' into jgrpp	3 months ago
network_secrets_settings.ini	Settings: Only write out config on setting change for persistent changes	9 months ago
network_settings.ini	Merge branch 'master' into jgrpp	4 months ago
news_display_settings.ini	Merge branch 'master' into jgrpp	4 months ago
old_gameopt_settings.ini	Revert #11993: new number format system does not and cannot work for CJK languages	3 months ago
pathfinding_settings.ini	Merge branch 'master' into jgrpp	4 months ago
scenario_settings.ini	Merge branch 'master' into jgrpp	4 months ago
script_settings.ini	Revert "Add setting to disable script parameter randomisation"	3 months ago
win32_settings.ini	Merge branch 'master' into jgrpp	4 months ago
window_settings.ini	Merge branch 'master' into jgrpp	4 months ago
world_settings.ini	Add setting to use object land ground for purchased land	3 months ago