Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						5e14b54a0c
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
					 | 
					
						2021-04-05 17:51:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						9bfa7198fd
					 | 
					
						
						
							
							Change: Heading for 1.12 now (#8862)
						
						
						
						
						
						
					 | 
					
						2021-03-14 20:47:31 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pavel Stupnikov
							
						 
					 | 
					
						
						
							
						
						4b42ecb0f6
					 | 
					
						
						
							
							Feature: Add tile parameter for GSCompany.ChangeBankBalance to show text effect if needed (#8573)
						
						
						
						
						
						
					 | 
					
						2021-01-22 10:28:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						8f964ee637
					 | 
					
						
						
							
							Add day length compatibility fixup for BeeRewards GS
						
						
						
						
						
						
					 | 
					
						2020-07-01 18:21:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx
							
						 
					 | 
					
						
						
							
						
						2f264f2c92
					 | 
					
						
						
							
							Change: Heading for 1.11 now
						
						
						
						
						
						
					 | 
					
						2020-02-08 23:38:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								S. D. Cloudt
							
						 
					 | 
					
						
						
							
						
						13cc8a0cee
					 | 
					
						
						
							
							Cleanup: Removed SVN  headers
						
						
						
						
						
						
					 | 
					
						2019-11-10 17:59:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						a67ee02529
					 | 
					
						
						
							
							Change: Heading for 1.10 now (#7319)
						
						
						
						
						
						
					 | 
					
						2019-03-03 20:51:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SamuXarick
							
						 
					 | 
					
						
						
							
						
						1e5a6765d9
					 | 
					
						
						
							
							Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988)
						
						
						
						
						
						
					 | 
					
						2019-01-31 23:08:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						09d4735679
					 | 
					
						
						
							
							(svn r27993) -Change: Heading for 1.9 now
						
						
						
						
						
						
					 | 
					
						2018-03-14 19:36:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						afcef7faa6
					 | 
					
						
						
							
							(svn r27780) -Update: Numbers
						
						
						
						
						
						
					 | 
					
						2017-03-11 20:50:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						0c7c0ada78
					 | 
					
						
						
							
							(svn r27518) -Update: Numbers
						
						
						
						
						
						
					 | 
					
						2016-03-01 20:00:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						6477356dd2
					 | 
					
						
						
							
							(svn r27192) -Change: heading for 1.6 now
						
						
						
						
						
						
					 | 
					
						2015-03-17 20:33:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alberth
							
						 
					 | 
					
						
						
							
						
						0143f486f2
					 | 
					
						
						
							
							(svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news.
						
						
						
						
						
						
					 | 
					
						2015-02-22 17:25:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						26262e035a
					 | 
					
						
						
							
							(svn r26410) -Fix: Missing svn properties
						
						
						
						
						
						
					 | 
					
						2014-03-17 20:28:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						6baa58a7d8
					 | 
					
						
						
							
							(svn r26407) -Fix: __ln__ never read the script compatibility files.
						
						
						
						
						
						
					 | 
					
						2014-03-17 20:05:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						db96a109ff
					 | 
					
						
						
							
							(svn r26406) -Change: heading for 1.5 now
						
						
						
						
						
						
					 | 
					
						2014-03-17 20:02:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						b1f41a0afb
					 | 
					
						
						
							
							(svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate.
						
						
						
						
						
						
					 | 
					
						2013-11-12 17:56:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7ff6598cd2
					 | 
					
						
						
							
							(svn r25001) -Change: heading for 1.4 now
						
						
						
						
						
						
					 | 
					
						2013-02-14 18:58:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yexo
							
						 
					 | 
					
						
						
							
						
						245baf820e
					 | 
					
						
						
							
							(svn r24469) -Fix (r24468): forgot to svn add the new files
						
						
						
						
						
						
					 | 
					
						2012-08-13 19:33:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |