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 
							
						 
					 
					
						
						
							
						
						95b65163e3 
					 
					
						
						
							
							Revert back to v2 of house picking/placing patch.  
						
						
						
						
					 
					
						2016-05-12 22:35:39 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						6ebea4b49c 
					 
					
						
						
							
							Merge v4 of house picking/placing patch.  
						
						
						
						
					 
					
						2016-04-08 19:51:37 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						7bd91f172b 
					 
					
						
						
							
							Change house GUI picker logic to be more like object GUI window.  
						
						... 
						
						
						
						Deselect house on object placement abort.
Set object placement on init or house selection.
Adjust display to still work even if no house selected,
by continuing to show the previous selection. 
						
						
					 
					
						2015-09-21 22:16:47 +01:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						3ec3842ad4 
					 
					
						
						
							
							Fix town_gui.h header file not being in imported diff  
						
						... 
						
						
						
						Use copy from http://www.tt-forums.net/viewtopic.php?p=1099696#p1099696  
						
						
					 
					
						2015-08-04 22:29:16 +01:00