Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						406b81abb1
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp-beta
						
						
						
						
						
						
						
						# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini 
						
						
					 | 
					
						2021-10-18 00:43:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium42
							
						 
					 | 
					
						
						
							
						
						08308d808c
					 | 
					
						
						
							
							Codechange: use separate pre and post callbacks for int settings
						
						
						
						
						
						
					 | 
					
						2021-05-29 10:07:30 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								S. D. Cloudt
							
						 
					 | 
					
						
						
							
						
						13cc8a0cee
					 | 
					
						
						
							
							Cleanup: Removed SVN  headers
						
						
						
						
						
						
					 | 
					
						2019-11-10 17:59:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						65b9a103ad
					 | 
					
						
						
							
							Initial implementation of two rail types per tile
						
						
						
						
						
						
					 | 
					
						2018-12-21 03:27:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						d9bfe88261
					 | 
					
						
						
							
							(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
						
						
						
						
						
						
					 | 
					
						2016-11-05 11:53:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						616c02c42e
					 | 
					
						
						
							
							(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
						
						
						
						
						
						
					 | 
					
						2016-11-05 11:53:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7efd7e19ed
					 | 
					
						
						
							
							(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
						
						
						
						
						
						
					 | 
					
						2011-01-18 22:31:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						ec4f688ca0
					 | 
					
						
						
							
							(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
						
						
						
						
						
						
					 | 
					
						2011-01-18 22:31:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						82fc28f77f
					 | 
					
						
						
							
							(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
						
						
						
						
						
						
					 | 
					
						2010-01-15 16:41:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						9467b7c6d6
					 | 
					
						
						
							
							(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
						
						
						
						
						
						
					 | 
					
						2010-01-15 16:41:15 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						496b541cb1
					 | 
					
						
						
							
							(svn r15334) -Codechange: reset setting to old value when the callback procedure returns false
						
						
						
						
						
						
					 | 
					
						2009-02-04 15:01:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						e3216e4b4b
					 | 
					
						
						
							
							(svn r15334) -Codechange: reset setting to old value when the callback procedure returns false
						
						
						
						
						
						
					 | 
					
						2009-02-04 15:01:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						923e21129c
					 | 
					
						
						
							
							(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
						
						
						
						
						
						
					 | 
					
						2008-05-29 15:13:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						e7a501100a
					 | 
					
						
						
							
							(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
						
						
						
						
						
						
					 | 
					
						2008-05-29 15:13:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						4625695653
					 | 
					
						
						
							
							(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
						
						
						
						
						
						
						
						-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped. 
						
						
					 | 
					
						2008-05-25 19:17:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						dc77647ea4
					 | 
					
						
						
							
							(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
						
						
						
						
						
						
						
						-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped. 
						
						
					 | 
					
						2008-05-25 19:17:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						386a3f1d20
					 | 
					
						
						
							
							(svn r13016) -Codechange: unify the detection if rail catenary should be drawn
						
						
						
						
						
						
					 | 
					
						2008-05-08 16:48:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						b4968c6bea
					 | 
					
						
						
							
							(svn r13016) -Codechange: unify the detection if rail catenary should be drawn
						
						
						
						
						
						
					 | 
					
						2008-05-08 16:48:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |