cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								4cd4cf8479 
								
							 
						 
						
							
							
								
								Resolved conflicts and build fixes.  
							
							 
							
							
							
						 
						
							2018-10-05 21:54:29 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								3f28634d1f 
								
							 
						 
						
							
							
								
								consolidate random number logic  
							
							 
							
							... 
							
							
							
							Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion. 
							
						 
						
							2015-03-15 14:07:47 +13:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								e197f5318b 
								
							 
						 
						
							
							
								
								fixing MSVC 2013 warning C4244: & C4305  
							
							 
							
							... 
							
							
							
							conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data 
							
						 
						
							2015-03-08 13:07:29 +13:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f4b5662562 
								
							 
						 
						
							
							
								
								Make sure not to add duplicate viewports ( Fixes   #1832 )  
							
							 
							
							... 
							
							
							
							Wasn't a problem while testing reload() on linux. Maybe an implementation difference with Ogre's D3D rendersystem? 
							
						 
						
							2014-08-19 19:47:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4a26dcb2ad 
								
							 
						 
						
							
							
								
								Avoid calling RenderTarget::update from within loadResource  
							
							 
							
							
							
						 
						
							2014-08-08 15:46:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c6bf9dfbfb 
								
							 
						 
						
							
							
								
								Add ManualResourceLoader for character previews ( Fixes   #1752 )  
							
							 
							
							
							
						 
						
							2014-08-06 20:13:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								edb5a54092 
								
							 
						 
						
							
							
								
								Include some more required Ogre headers explicitely.  
							
							 
							
							
							
						 
						
							2014-03-05 21:46:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								643e7651e0 
								
							 
						 
						
							
							
								
								Use a null material for non-SubEntities in the selection buffer  
							
							 
							
							
							
						 
						
							2013-08-06 19:49:00 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d696da7677 
								
							 
						 
						
							
							
								
								Fix selection buffer  
							
							 
							
							
							
						 
						
							2013-03-07 21:38:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								4eae810de3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'edmondo/master'  
							
							 
							
							
							
						 
						
							2012-09-16 10:37:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Edmondo Tommasina 
								
							 
						 
						
							
							
							
							
								
							
							
								f21faf197c 
								
							 
						 
						
							
							
								
								selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’  
							
							 
							
							
							
						 
						
							2012-09-15 22:19:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Mc Donnell 
								
							 
						 
						
							
							
							
							
								
							
							
								c161a3850f 
								
							 
						 
						
							
							
								
								Use correct type for iterator  
							
							 
							
							... 
							
							
							
							Fixes building on Windows with vs2010. 
							
						 
						
							2012-09-15 15:37:18 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								565aad3783 
								
							 
						 
						
							
							
								
								changed a method for ogre 1.8.0  
							
							 
							
							
							
						 
						
							2012-09-14 14:49:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1f7e044fad 
								
							 
						 
						
							
							
								
								removed some debug stuff  
							
							 
							
							
							
						 
						
							2012-09-14 14:41:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6ac2a12296 
								
							 
						 
						
							
							
								
								item selection working on the preview  
							
							 
							
							
							
						 
						
							2012-09-14 14:34:18 +02:00