 Jonathan G Rennison
		
	
	86a6f63e2f
	
	
	Merge branch 'master' into jgrpp
			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
		
	
 
		2024-02-15 23:49:11 +00:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2021-01-22 10:26:45 +01:00
		 
	
		
			
			
			
			
			
			2020-06-27 18:21:17 +02:00
		 
	
		
			
			
			
			
			
			2021-04-24 13:19:13 +02:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:41:17 +01:00
		 
	
		
			
			
			
			
			
			2023-09-11 18:55:23 +00:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:12:54 +01:00
		 
	
		
			
			
			
			
			
			2023-12-02 23:11:00 +00:00
		 
	
		
			
			
			
			
			
			2024-01-04 13:40:59 +01:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2006-03-29 16:30:26 +00:00
		 
	
		
			
			
			
			
			
			2021-07-20 19:57:23 +02:00
		 
	
		
			
			
			
			
			
			2023-09-03 20:58:25 +01:00
		 
	
		
			
			
			
			
			
			2010-08-27 10:42:48 +00:00
		 
	
		
			
			
			
			
			
			2024-01-30 19:28:05 +00:00
		 
	
		
			
			
			
			
			
			2024-01-30 19:28:05 +00:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:12:54 +01:00
		 
	
		
			
			
			
			
			
			2020-01-26 13:45:51 +01:00
		 
	
		
			
			
			
			
			
			2023-09-11 18:55:23 +00:00
		 
	
		
			
			
			
			
			
			2024-02-01 18:48:07 +00:00
		 
	
		
			
			
			
			
			
			2024-02-01 18:48:07 +00:00
		 
	
		
			
			
			
			
			
			2022-12-12 23:19:44 +00:00
		 
	
		
			
			
			
			
			
			2022-12-12 23:19:44 +00:00
		 
	
		
			
			
			
			
			
			2024-01-16 20:40:17 +00:00
		 
	
		
			
			
			
			
			
			2024-02-03 17:52:28 +00:00
		 
	
		
			
			
			
			
			
			2023-04-13 21:19:53 +01:00
		 
	
		
			
			
			
			
			
			2023-04-13 21:19:53 +01:00
		 
	
		
			
			
			
			
			
			2011-10-04 21:35:47 +00:00
		 
	
		
			
			
			
			
			
			2018-06-05 22:58:35 +02:00
		 
	
		
			
			
			
			
			
			2009-10-22 16:01:28 +00:00
		 
	
		
			
			
			
			
			
			2024-01-22 22:35:25 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2023-03-26 11:08:37 +02:00
		 
	
		
			
			
			
			
			
			2021-07-10 18:38:28 +02:00
		 
	
		
			
			
			
			
			
			2023-11-29 20:49:31 +00:00
		 
	
		
			
			
			
			
			
			2023-08-30 18:27:15 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00