rubidium42 
							
						 
					 
					
						
						
							
						
						98e653dacc 
					 
					
						
						
							
							Fix   #9386 : compilers failing to compile with LTO by using variants instead of new + unique_ptr  
						
						 
						
						... 
						
						
						
						With std::variant all memory can be figured out at compile time, so the compiler needs to keep track of fewer elements. It also saves out a unique_ptr and its memory management, over a slight impact for resolving a setting. 
						
						
					 
					
						2021-06-26 20:28:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						1ed7afc0a8 
					 
					
						
						
							
							Change: [GitHub] use an issue form to let people fill in bug report / crashes ( #9400 )  
						
						 
						
						
						
						
					 
					
						2021-06-26 13:51:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Loïc Guilloux 
							
						 
					 
					
						
						
							
						
						f86c66cbd7 
					 
					
						
						
							
							Codechange: [Actions] Improve MSYS2 setup time ( #9360 )  
						
						 
						
						
						
						
					 
					
						2021-06-13 13:26:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Loïc Guilloux 
							
						 
					 
					
						
						
							
						
						acb6348ba6 
					 
					
						
						
							
							Add: [Actions] msys2/MinGW CI ( #8698 )  
						
						 
						
						
						
						
					 
					
						2021-06-10 23:54:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						3ce7e31f64 
					 
					
						
						
							
							Feature: Sign Windows builds  
						
						 
						
						
						
						
					 
					
						2021-05-26 13:40:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						3477405e86 
					 
					
						
						
							
							Change: [Actions] use newly created Actions instead of custom shell-scripting ( #9284 )  
						
						 
						
						
						
						
					 
					
						2021-05-20 19:12:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Loïc Guilloux 
							
						 
					 
					
						
						
							
						
						c53d9991ee 
					 
					
						
						
							
							Add: [Actions] Check CI annotations to detect compile warnings ( #9217 )  
						
						 
						
						
						
						
					 
					
						2021-05-10 14:48:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Loïc Guilloux 
							
						 
					 
					
						
						
							
						
						282d5d302d 
					 
					
						
						
							
							Change: [Actions] Add a 2 minutes timeout for regression test ( #9166 )  
						
						 
						
						
						
						
					 
					
						2021-05-01 16:18:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						8eb27e1ac7 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h 
						
						
					 
					
						2021-04-25 22:14:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tyler Trahan 
							
						 
					 
					
						
						
							
						
						27031b396f 
					 
					
						
						
							
							Change: [Actions] Reword bug/crash report instructions ( #9104 )  
						
						 
						
						
						
						
					 
					
						2021-04-25 19:27:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						253772e9af 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in 
						
						
					 
					
						2021-04-25 02:14:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						2e39ac5ba2 
					 
					
						
						
							
							Add: [GitHub] use issue templates to make it more clear what we expect from users ( #9092 )  
						
						 
						
						
						
						
					 
					
						2021-04-24 17:03:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						d0159f2452 
					 
					
						
						
							
							Github: Disable CI build workflow on push to master  
						
						 
						
						
						
						
					 
					
						2021-04-11 03:16:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						edfa04286b 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/release.yml
#	bin/CMakeLists.txt
#	src/dock_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/indonesian.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/polish.txt
#	src/lang/portuguese.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.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/object_gui.cpp
#	src/pathfinder/yapf/yapf_costrail.hpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_cmd.cpp
#	src/roadveh_cmd.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp 
						
						
					 
					
						2021-04-11 02:39:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						5e14b54a0c 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						
						
						
					 
					
						2021-04-05 17:51:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						2a9825b8de 
					 
					
						
						
							
							Add: [Actions] Debian Bullseye release build ( #8921 )  
						
						 
						
						
						
						
					 
					
						2021-04-01 20:45:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						9639e77297 
					 
					
						
						
							
							Fix: [Actions] "is-tag" variable is the 5th element, not 6th  
						
						 
						
						... 
						
						
						
						The 6th is "is-stable-tag", but it is currently broken in meaning.
Betas and RCs are considered "stable", but final releases are not.
This is the reason it was working for RC1, but not for the final
release. 
						
						
					 
					
						2021-04-01 13:26:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						64a8c38d2f 
					 
					
						
						
							
							Fix: [Actions] update environment variable for AWS region ( #8827 )  
						
						 
						
						
						
						
					 
					
						2021-03-08 23:31:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						92eb93561c 
					 
					
						
						
							
							Github: Add workflow dispatch trigger for CI builds  
						
						 
						
						
						
						
					 
					
						2021-03-04 17:31:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						eab32e8861 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt 
						
						
					 
					
						2021-03-04 15:33:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						db0993f500 
					 
					
						
						
							
							Change: [Actions] Also check dedicated build  
						
						 
						
						
						
						
					 
					
						2021-03-04 16:22:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						26dcd0734e 
					 
					
						
						
							
							Github: Disable release upload jobs  
						
						 
						
						
						
						
					 
					
						2021-03-02 23:45:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						d7b76df1f5 
					 
					
						
						
							
							Github: Fix revision logging in release workflow  
						
						 
						
						
						
						
					 
					
						2021-03-02 22:57:29 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						6482a48099 
					 
					
						
						
							
							Github: Adjust version file info in release workflow  
						
						 
						
						
						
						
					 
					
						2021-03-02 20:05:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						84a7ab180e 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/company_cmd.cpp
#	src/lang/greek.txt
#	src/table/settings.ini 
						
						
					 
					
						2021-03-02 13:46:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						f4e29071be 
					 
					
						
						
							
							Merge tag '1.11.0-beta2' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/debug.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/lang/czech.txt
#	src/lang/english.txt
#	src/lang/italian.txt
#	src/lang/swedish.txt
#	src/lang/ukrainian.txt
#	src/network/network_server.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/follow_track.hpp
#	src/screenshot.cpp
#	src/settings_type.h
#	src/spritecache.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/video_driver.cpp
#	src/video/video_driver.hpp
#	src/video/win32_v.cpp 
						
						
					 
					
						2021-03-02 11:59:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						cd4c8ecbf3 
					 
					
						
						
							
							Add: [Actions] Allow partial cache invalidation on dependencies change  
						
						 
						
						
						
						
					 
					
						2021-03-01 22:41:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dP 
							
						 
					 
					
						
						
							
						
						b284d34277 
					 
					
						
						
							
							Add: Support Zstandard(zstd) savegame compression  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 6f0aeaf2c5436550c93205e704624957e9abc969) 
						
						
					 
					
						2021-03-01 18:08:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						70e4845915 
					 
					
						
						
							
							Change: [Actions] Use only CMake, CTest and CPack  
						
						 
						
						
						
						
					 
					
						2021-02-24 17:54:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						90adac8f09 
					 
					
						
						
							
							Change: [Actions] stop using 'run-vcpkg' action for Release  
						
						 
						
						
						
						
					 
					
						2021-02-24 17:54:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						58640824d1 
					 
					
						
						
							
							Change: [Actions] stop using 'run-cmake' action for Release  
						
						 
						
						
						
						
					 
					
						2021-02-24 17:54:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						2fd2950eb5 
					 
					
						
						
							
							Change: [Actions] stop using 'run-vcpkg' action for CI  
						
						 
						
						
						
						
					 
					
						2021-02-24 17:54:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						30ae019095 
					 
					
						
						
							
							Change: [Actions] stop using 'run-cmake' action for CI  
						
						 
						
						
						
						
					 
					
						2021-02-24 17:54:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						68a0a4d1b9 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/newgrf_config.cpp 
						
						
					 
					
						2021-02-19 20:34:14 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						b124c49ea4 
					 
					
						
						
							
							Fix: [Actions] Also run CI against libsdl1.2 for every pull request  
						
						 
						
						
						
						
					 
					
						2021-02-19 19:56:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						e95216b59d 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp 
						
						
					 
					
						2021-02-19 15:38:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						cb8e1706b2 
					 
					
						
						
							
							Fix: [Actions] if SDL2 is installed, it is always picked over SDL1  
						
						 
						
						... 
						
						
						
						So no need to install both SDL1 and SDL2, that gives a false idea
of reality. 
						
						
					 
					
						2021-02-19 11:34:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						d3df4674f9 
					 
					
						
						
							
							Fix: [Actions] build our allegro driver too in our CI  
						
						 
						
						... 
						
						
						
						This prevents us breaking it without realising. 
						
						
					 
					
						2021-02-19 11:34:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						d3b50b9c47 
					 
					
						
						
							
							Fix: [Actions] Use vcpkg to provide libpng on macOS  
						
						 
						
						
						
						
					 
					
						2021-02-15 12:10:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Lutz 
							
						 
					 
					
						
						
							
						
						6755ff63e1 
					 
					
						
						
							
							Add: [OSX] Native font rendering without using FreeType.  
						
						 
						
						
						
						
					 
					
						2021-02-14 11:48:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								glx22 
							
						 
					 
					
						
						
							
						
						f181037bed 
					 
					
						
						
							
							Change: [Actions] Also run CI for VS2017  
						
						 
						
						
						
						
					 
					
						2021-02-13 17:31:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						395e015282 
					 
					
						
						
							
							Change: Convert .md to .rtf for Windows/Mac packages  
						
						 
						
						
						
						
					 
					
						2021-02-08 23:23:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Owen Rudge 
							
						 
					 
					
						
						
							
						
						da4c404f3d 
					 
					
						
						
							
							Fix: [Actions] Use same vcpkg commit for CI on macOS as release builds  
						
						 
						
						
						
						
					 
					
						2021-02-08 16:13:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						4f0692c437 
					 
					
						
						
							
							Codechange: [Actions] Document better why we build our own fluidsynth ( #8646 )  
						
						 
						
						... 
						
						
						
						nielsmh nicely correct us in #8641 , pointing out the old comment
is not telling a complete truth. The result is the same, but it
is better to not mislead future-us. 
						
						
					 
					
						2021-02-05 23:56:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						a667ed945f 
					 
					
						
						
							
							Add: [Actions] Automatically upload releases to Steam ( #8644 )  
						
						 
						
						
						
						
					 
					
						2021-02-05 20:58:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patric Stout 
							
						 
					 
					
						
						
							
						
						05df7996a4 
					 
					
						
						
							
							Feature: [Actions / CMake] support for generic linux builds ( #8641 )  
						
						 
						
						... 
						
						
						
						These bundles can be opened on any "modern" Linux machine with
a driver that SDL2 supports.
Machines needs at least glibc 2.15, which was released 10 years ago.
It is build with CentOS 7 as base, and only assumes the following
libraries are available on the system:
- libc
- libdl
- libgcc_s
- libpthread
- librt
- libstdc++
All other libraries the game depends on are bundled together with
the game, so users don't need any library installed to use this
bundle. The downside of course is that this increases the binary
size a bit: 30 MiB of libraries are in this bundle.
RPATH is used to make ld-linux find the folder libraries are
stored in; however, system libraries are always used before these,
in the assumption libraries on the user system are more up-to-date.
Using -DOPTION_PACKAGE_DEPENDENCIES=ON switches on packaging
of libraries in the "lib" folder. This requires CMake 3.16 to
be installed; otherwise it will fail. 
						
						
					 
					
						2021-02-05 12:31:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						650d5e014e 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/ai/ai_gui.cpp
#	src/company_cmd.cpp
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/korean.txt
#	src/lang/slovak.txt
#	src/main_gui.cpp
#	src/video/sdl2_v.cpp 
						
						
					 
					
						2021-02-01 19:34:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						7154f8859d 
					 
					
						
						
							
							Merge tag '1.11.0-beta1' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp 
						
						
					 
					
						2021-02-01 18:58:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						b7ddd486cf 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp 
						
						
					 
					
						2021-02-01 17:07:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						6c3e5642f8 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h 
						
						
					 
					
						2021-01-31 01:08:35 +00:00