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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								S. D. Cloudt
							
						 
					 | 
					
						
						
							
						
						13cc8a0cee
					 | 
					
						
						
							
							Cleanup: Removed SVN  headers
						
						
						
						
						
						
					 | 
					
						2019-11-10 17:59:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						36eb4165b8
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h 
						
						
					 | 
					
						2019-07-08 16:19:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Pigott
							
						 
					 | 
					
						
						
							
						
						9f3928658b
					 | 
					
						
						
							
							Codechange: Remove Track{dir,}{Bits,}Byte types
						
						
						
						
						
						
					 | 
					
						2019-04-29 17:40:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						65b9a103ad
					 | 
					
						
						
							
							Initial implementation of two rail types per tile
						
						
						
						
						
						
					 | 
					
						2018-12-21 03:27:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peter1138
							
						 
					 | 
					
						
						
							
						
						06785c9df2
					 | 
					
						
						
							
							(svn r27833) -Change: Trackdir maps directly to TrackdirBits
						
						
						
						
						
						
					 | 
					
						2017-03-28 21:44:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peter1138
							
						 
					 | 
					
						
						
							
						
						4f3c7e74e7
					 | 
					
						
						
							
							(svn r27833) -Change: Trackdir maps directly to TrackdirBits
						
						
						
						
						
						
					 | 
					
						2017-03-28 21:44:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						df16ebd730
					 | 
					
						
						
							
							(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
						
						
						
						
						
						
					 | 
					
						2011-12-19 17:48:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						3d605f6488
					 | 
					
						
						
							
							(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
						
						
						
						
						
						
					 | 
					
						2011-12-19 17:48:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						0d4e6c46ff
					 | 
					
						
						
							
							(svn r19605) -Codechange: Merge ExtractBits into EnumPropsT.
						
						
						
						
						
						
					 | 
					
						2010-04-11 15:44:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						6726bc727a
					 | 
					
						
						
							
							(svn r19605) -Codechange: Merge ExtractBits into EnumPropsT.
						
						
						
						
						
						
					 | 
					
						2010-04-11 15:44:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						53aaabe6e9
					 | 
					
						
						
							
							(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
						
						
						
						
						
						
					 | 
					
						2010-03-23 22:25:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						d2e99657fa
					 | 
					
						
						
							
							(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
						
						
						
						
						
						
					 | 
					
						2010-03-23 22:25:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7fbc33dae1
					 | 
					
						
						
							
							(svn r17248) -Fix: add GPL license notice where appropriate
						
						
						
						
						
						
					 | 
					
						2009-08-21 20:21:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						99d46e0ad7
					 | 
					
						
						
							
							(svn r17248) -Fix: add GPL license notice where appropriate
						
						
						
						
						
						
					 | 
					
						2009-08-21 20:21:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						b19d0e0254
					 | 
					
						
						
							
							(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
						
						
						
						
						
						
					 | 
					
						2009-05-26 11:19:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						87dfc2a881
					 | 
					
						
						
							
							(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
						
						
						
						
						
						
					 | 
					
						2009-05-26 11:19:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						b7993793c8
					 | 
					
						
						
							
							(svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
						
						
						
						
						
						
					 | 
					
						2008-02-20 17:49:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						7f3d56041b
					 | 
					
						
						
							
							(svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
						
						
						
						
						
						
					 | 
					
						2008-02-20 17:49:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						a78d73805f
					 | 
					
						
						
							
							(svn r11827) -Codechange: do not include enum_type.hpp unnecessary.
						
						
						
						
						
						
					 | 
					
						2008-01-13 00:28:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						72c9b35b11
					 | 
					
						
						
							
							(svn r11827) -Codechange: do not include enum_type.hpp unnecessary.
						
						
						
						
						
						
					 | 
					
						2008-01-13 00:28:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7db6c7db38
					 | 
					
						
						
							
							(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
						
						
						
						
						
						
					 | 
					
						2007-12-18 20:58:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						818a23e7f2
					 | 
					
						
						
							
							(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
						
						
						
						
						
						
					 | 
					
						2007-12-18 20:58:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						df0c6eb2b9
					 | 
					
						
						
							
							(svn r11662) -Codechange: move some rail types/related functions around.
						
						
						
						
						
						
					 | 
					
						2007-12-18 20:10:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						2e2d76f445
					 | 
					
						
						
							
							(svn r11662) -Codechange: move some rail types/related functions around.
						
						
						
						
						
						
					 | 
					
						2007-12-18 20:10:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |