| 
							
							
								 Jonathan G Rennison | 7960db35f2 | Merge branch 'master' into jgrpp # Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h | 2020-01-06 18:45:51 +00:00 |  | 
			
				
					| 
							
							
								 Jonathan G Rennison | cbdd9f84d8 | Merge branch 'master' into jgrpp # Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h | 2019-11-12 18:43:10 +00:00 |  | 
			
				
					| 
							
							
								 Jonathan G Rennison | 89a0a9c182 | Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. | 2017-03-05 14:39:10 +00:00 |  | 
			
				
					| 
							
							
								 Jonathan G Rennison | afd8c6b867 | Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit. Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2. | 2017-03-05 14:39:01 +00:00 |  | 
			
				
					| 
							
							
								 Jonathan G Rennison | aac5b2d4ad | Chunnel: Adjust struct Tunnel constructor | 2017-03-04 12:36:01 +00:00 |  | 
			
				
					| 
							
							
								 HackaLittleBit | dfce9cc4c0 | Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles. https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416 | 2017-03-04 11:48:12 +00:00 |  | 
			
				
					| 
							
							
								 HackaLittleBit | ad070b91ea | Chunnel patch 28392: Add: Basic tunnel pool. (no save) https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416 | 2017-03-04 11:43:53 +00:00 |  |