Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						2ed248a61d 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp 
						
						
					 
					
						2023-05-31 23:21:38 +01:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						fbad57ecf7 
					 
					
						
						
							
							Change: [CI] update emscripten and liblzma to the latest version ( #10757 )  
						
						
						
						
					 
					
						2023-05-02 23:12:52 +02:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						f951ce6931 
					 
					
						
						
							
							Fix: Ensure logo for Windows Store common assets package is named correctly  
						
						
						
						
					 
					
						2023-02-07 09:23:44 +00:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						be0d65d978 
					 
					
						
						
							
							Add: [Actions] upload releases to GOG automatically  
						
						
						
						
					 
					
						2023-01-28 20:41:08 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						a1f6aaa58f 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp 
						
						
					 
					
						2022-12-31 18:17:24 +00:00 
						 
				 
			
				
					
						
							
							
								clienthax 
							
						 
					 
					
						
						
							
						
						25f247047d 
					 
					
						
						
							
							Update: emsdk to 3.1.28 and lzma (for emsdk) to 5.4.0 ( #10234 )  
						
						... 
						
						
						
						Co-authored-by: Patric Stout <truebrain@openttd.org > 
						
						
					 
					
						2022-12-29 23:34:45 +01:00 
						 
				 
			
				
					
						
							
							
								Czcibor Bohusz-Dobosz 
							
						 
					 
					
						
						
							
						
						7425660b3e 
					 
					
						
						
							
							Change: Set minimum macOS version to 10.13 ( #10253 )  
						
						
						
						
					 
					
						2022-12-17 18:35:45 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						0a9c44d1a2 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp 
						
						
					 
					
						2022-10-16 20:14:13 +01:00 
						 
				 
			
				
					
						
							
							
								Bouke Haarsma 
							
						 
					 
					
						
						
							
						
						45d98f689a 
					 
					
						
						
							
							Fix   #9993 : Handle DPI changes on macOS and Windows  
						
						
						
						
					 
					
						2022-10-16 16:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						5b7db9d849 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini 
						
						
					 
					
						2022-05-15 13:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						5a6ea11ead 
					 
					
						
						
							
							Feature: [Actions] Package builds for the Windows Store automatically  
						
						
						
						
					 
					
						2022-05-04 11:40:49 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						0691b25e17 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	src/saveload/afterload.cpp 
						
						
					 
					
						2021-11-20 13:15:32 +00:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						0cbe94256e 
					 
					
						
						
							
							Change: [Emscripten] update to 2.0.34 and use Release over RelWithDebInfo ( #9696 )  
						
						... 
						
						
						
						It turns out that having "-g" in the compile-statement causes
Emscripten to pick -g3, which makes for very big binaries. This
is very likely not your intention when building Emscripten, as
smaller really is better.
For comparison, with RelWithDebInfo the binary is ~80MB. With
Release it is ~7.4MB. 
						
						
					 
					
						2021-11-14 16:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						dca7e7bc58 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						
						
						
					 
					
						2021-11-12 18:07:11 +00:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						2f72eb0657 
					 
					
						
						
							
							Add: Specify minimum version for macOS ( #9689 )  
						
						
						
						
					 
					
						2021-11-11 20:06:31 +01:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						7d40cc9291 
					 
					
						
						
							
							Change: Explicitly specify SHA1 for legacy code signing on Windows  
						
						
						
						
					 
					
						2021-11-10 10:26:33 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						9e946d4c5d 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp 
						
						
					 
					
						2021-11-03 00:45:12 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						62afd94b47 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp 
						
						
					 
					
						2021-11-01 18:54:43 +00:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						3046a6ce39 
					 
					
						
						
							
							Change: upgrade Emscripten to 2.0.31 and enable LZMA by default ( #9604 )  
						
						
						
						
					 
					
						2021-10-03 16:20:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						fd605e3cf3 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp 
						
						
					 
					
						2021-09-27 22:47:23 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						0b0d154788 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h 
						
						
					 
					
						2021-09-22 21:50:02 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						2bd535e834 
					 
					
						
						
							
							Merge branch 'master' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	src/engine_base.h
#	src/gfxinit.cpp
#	src/graph_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/network/core/address.cpp
#	src/network/core/game_info.h
#	src/network/core/os_abstraction.h
#	src/network/core/udp.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/newgrf_engine.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/string_func.h
#	src/town_gui.cpp
#	src/video/video_driver.cpp
#	src/widget_type.h 
						
						
					 
					
						2021-09-18 01:28:57 +01:00 
						 
				 
			
				
					
						
							
							
								embeddedt 
							
						 
					 
					
						
						
							
						
						883e4ea325 
					 
					
						
						
							
							Change: [Emscripten] set default scrolling mode to non-pointer-locking ( #9191 )  
						
						
						
						
					 
					
						2021-06-28 18:39:09 +02:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						3ce7e31f64 
					 
					
						
						
							
							Feature: Sign Windows builds  
						
						
						
						
					 
					
						2021-05-26 13:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								rubidium42 
							
						 
					 
					
						
						
							
						
						44ca7d9377 
					 
					
						
						
							
							Change: Use gender-neutral pronouns  
						
						
						
						
					 
					
						2021-05-15 10:16:48 +02:00 
						 
				 
			
				
					
						
							
							
								embeddedt 
							
						 
					 
					
						
						
							
						
						86741ad489 
					 
					
						
						
							
							Fix: [Emscripten] Force secure WebSockets over HTTPS ( #9248 )  
						
						
						
						
					 
					
						2021-05-13 10:13:34 +02:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						69118d063f 
					 
					
						
						
							
							Change: use TCP for everything except for master-server and initial server scan ( #9130 )  
						
						... 
						
						
						
						This means that pressing Refresh button and adding servers manually
now uses TCP.
The master-server and initial scan are still UDP as they will be
replaced by Game Coordinator; no need to change this now.
If we query a server that is too old, show a proper warning to the
user informing him the server is too old. 
						
						
					 
					
						2021-04-30 11:34:47 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						eabfae9d31 
					 
					
						
						
							
							MacOS: Change bundle ID  
						
						... 
						
						
						
						See: #208  
						
						
					 
					
						2021-02-25 12:15:37 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Lutz 
							
						 
					 
					
						
						
							
						
						0fc763bc55 
					 
					
						
						
							
							Change: [OSX] Render screen in full native resolution on HiDPI displays.  
						
						
						
						
					 
					
						2021-02-14 11:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								embeddedt 
							
						 
					 
					
						
						
							
						
						6c8f2227cd 
					 
					
						
						
							
							Fix: [Emscripten] open links in browser ( #8655 )  
						
						
						
						
					 
					
						2021-02-08 19:18:30 +01:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						a667ed945f 
					 
					
						
						
							
							Add: [Actions] Automatically upload releases to Steam ( #8644 )  
						
						
						
						
					 
					
						2021-02-05 20:58:15 +01:00 
						 
				 
			
				
					
						
							
							
								embeddedt 
							
						 
					 
					
						
						
							
						
						76a279ef68 
					 
					
						
						
							
							Fix: [Emscripten] Pin Dockerfile to emsdk:2.0.10 to prevent patch failure ( #8628 )  
						
						
						
						
					 
					
						2021-01-31 15:27:17 +01:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						1187dc3217 
					 
					
						
						
							
							Feature: [Actions] Create .zip for macOS build  
						
						
						
						
					 
					
						2021-01-28 19:15:36 +00:00 
						 
				 
			
				
					
						
							
							
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						60851ef1a6 
					 
					
						
						
							
							Feature: Sign macOS builds  
						
						
						
						
					 
					
						2021-01-13 13:45:52 +00:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						7cdf7c7ca0 
					 
					
						
						
							
							Fix: [bundle] custom launch.sh is no longer required for Mac OS  
						
						... 
						
						
						
						Co-authored-by: Owen Rudge <owen@owenrudge.net > 
						
						
					 
					
						2020-12-19 18:26:29 +01:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						d15dc9f40f 
					 
					
						
						
							
							Add: support for emscripten (play-OpenTTD-in-the-browser)  
						
						... 
						
						
						
						Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.
Co-authored-by: milek7 <me@milek7.pl > 
						
						
					 
					
						2020-12-15 15:46:39 +01:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						b7643b1d36 
					 
					
						
						
							
							Add: create bundles via CPack  
						
						... 
						
						
						
						CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more. 
						
						
					 
					
						2020-06-05 19:36:05 +02:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						56d54cf60e 
					 
					
						
						
							
							Add: introduce CMake for project management  
						
						... 
						
						
						
						CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc. 
						
						
					 
					
						2020-06-05 19:36:05 +02:00 
						 
				 
			
				
					
						
							
							
								duck 
							
						 
					 
					
						
						
							
						
						e1c85e67a7 
					 
					
						
						
							
							Fix   #8102 : Update Windows installer strings to reference newer Windows version ( #8114 )  
						
						... 
						
						
						
						* Fix  #8102 : Update Windows installer strings to reference versions newer than 7
* Fix 2c53390: Version strings incorrectly capitalised 
						
						
					 
					
						2020-05-05 22:05:40 +02:00 
						 
				 
			
				
					
						
							
							
								glx 
							
						 
					 
					
						
						
							
						
						2f264f2c92 
					 
					
						
						
							
							Change: Heading for 1.11 now  
						
						
						
						
					 
					
						2020-02-08 23:38:49 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						18f03a300b 
					 
					
						
						
							
							Update: Prepare for 1.10.0-beta2 release  
						
						
						
						
					 
					
						2019-12-24 22:20:28 +00:00 
						 
				 
			
				
					
						
							
							
								S. D. Cloudt 
							
						 
					 
					
						
						
							
						
						13cc8a0cee 
					 
					
						
						
							
							Cleanup: Removed SVN  headers  
						
						
						
						
					 
					
						2019-11-10 17:59:20 +00:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						9f50c754ff 
					 
					
						
						
							
							Codechange: No longer expect iculx when building debs  
						
						
						
						
					 
					
						2019-10-30 17:28:22 +00:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						dd07b23ed3 
					 
					
						
						
							
							Fix: A few places still referred to old name of COPYING and README  
						
						
						
						
					 
					
						2019-10-28 23:52:54 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						f5b72059be 
					 
					
						
						
							
							Update: Changelog and other release files for 1.10.0-beta1  
						
						
						
						
					 
					
						2019-10-28 23:52:54 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						57add90b0f 
					 
					
						
						
							
							Doc: Updates from 1.9  
						
						
						
						
					 
					
						2019-10-28 23:52:54 +01:00 
						 
				 
			
				
					
						
							
							
								glx 
							
						 
					 
					
						
						
							
						
						93e42a9407 
					 
					
						
						
							
							Fix  3575dd551: update names for installer  
						
						
						
						
					 
					
						2019-10-23 15:05:40 +02:00 
						 
				 
			
				
					
						
							
							
								JMcKiern 
							
						 
					 
					
						
						
							
						
						04f659e768 
					 
					
						
						
							
							Fix: Some typos found using codespell  
						
						
						
						
					 
					
						2019-09-29 21:27:32 +01:00 
						 
				 
			
				
					
						
							
							
								nikolas 
							
						 
					 
					
						
						
							
						
						2d27e8e685 
					 
					
						
						
							
							Add  #6173 : New SDL 2 based video and sound drivers ( #7086 )  
						
						
						
						
					 
					
						2019-09-19 17:18:50 +02:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						c99f731f89 
					 
					
						
						
							
							Update: documentation updates from 1.9 branch  
						
						
						
						
					 
					
						2019-04-05 00:19:41 +02:00