554999eedc 
								
							
								 
							
						 
						
							
							
								
								merge upstream/master  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								a75e38fb40 
								
							
								 
							
						 
						
							
							
								
								Remove old commented code  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								a59aaea29d 
								
							
								 
							
						 
						
							
							
								
								test: Don't use 'Error:' or 'error:' in test output  
							
							... 
							
							
 
							
							This is parsed by msbuild when using Visual Studio project
files, and will automatically fail the build if encountered.
This is a bug (or badly designed intentional behaviour) in
msbuild.  See
  http://blogs.msdn.com/b/dsvc/archive/2012/02/29/output-from-exec-task-resulting-in-build-failure.aspx 
for further details. 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								0af2e05b1b 
								
							
								 
							
						 
						
							
							
								
								Merge 0.9.7 branch  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								627d36fd47 
								
							
								 
							
						 
						
							
							
								
								Updated GLM version  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								f1e9c2f186 
								
							
								 
							
						 
						
							
							
								
								Fixed Cygwin build errors when using C++11  #405  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								85e88a366d 
								
							
								 
							
						 
						
							
							
								
								Cygwin GCC doesn't have a C++11 STL library  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								e5b84bd4b4 
								
							
								 
							
						 
						
							
							
								
								Added changelog  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								96b7850cab 
								
							
								 
							
						 
						
							
							
								
								Fix unintentional backface culling in triangle intersect  
							
							... 
							
							
 
							
							This also fixes  #194 . The backface culling is unintentional because it is not documented anywhere and we can't give the triangle a normal so just assume the general case. 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								e05935c7bd 
								
							
								 
							
						 
						
							
							
								
								Add const qualifier in extractEulerAngleXYZ()  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								32fc69ee11 
								
							
								 
							
						 
						
							
							
								
								- Added unary + operator  #435  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								5cd49977e6 
								
							
								 
							
						 
						
							
							
								
								Fixed build  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								a257beb5de 
								
							
								 
							
						 
						
							
							
								
								Added missing bvec* && and || operators  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								560dcdbec0 
								
							
								 
							
						 
						
							
							
								
								Added 8bit pack and unpack to GTC_packing  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								bb9ce516b0 
								
							
								 
							
						 
						
							
							
								
								Added 16bit pack and unpack to GTC_packing  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								92a6c207bc 
								
							
								 
							
						 
						
							
							
								
								Fixed build on C++98 compiler  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								7f4d8c38c9 
								
							
								 
							
						 
						
							
							
								
								Fixed (un)packHalf  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								04c8f05a34 
								
							
								 
							
						 
						
							
							
								
								Added (un)packUnorm and (un)packSnorm to GTC_packing  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								65c8f8fcf0 
								
							
								 
							
						 
						
							
							
								
								Added (un)packHalf  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								8508e099d0 
								
							
								 
							
						 
						
							
							
								
								Fixed compScale test  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								273beb8779 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/g-truc/glm  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								869caacac5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'static-const' of  https://github.com/g-truc/glm  into static-const  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								9902e3014f 
								
							
								 
							
						 
						
							
							
								
								Fixed GTX_extended_min_max build  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								143c4c336a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #429  from JesseTG/jtg/static-const  
							
							... 
							
							
 
							
							Add GLM_STATIC_CONST_MEMBERS #429  
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								64c86d1760 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #428  from JesseTG/jtg/ignore-more  
							
							... 
							
							
 
							
							Let's try .gitignore again #428  
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								23af86ebe1 
								
							
								 
							
						 
						
							
							
								
								Let's try .gitignore again  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								e55eb1e08b 
								
							
								 
							
						 
						
							
							
								
								Removed ambiguity in fmat4x4 constructor  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								08bf6e78c9 
								
							
								 
							
						 
						
							
							
								
								Renamed comp (X|Y|Z|W) template parameters in fvec4SIMD to (X|Y|Z|W)_  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								2d1463ced7 
								
							
								 
							
						 
						
							
							
								
								Fixed GTX_extended_min_max filename typo  #386  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								b0285416b0 
								
							
								 
							
						 
						
							
							
								
								Fixed GTX_extended_min_max filename typo  #386  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								132bccce1c 
								
							
								 
							
						 
						
							
							
								
								Merge branch '0.9.7'  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								4b5694a51c 
								
							
								 
							
						 
						
							
							
								
								Fixed readme #include path  #426  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								27fa44f2b8 
								
							
								 
							
						 
						
							
							
								
								Fixed readme #include path  #426  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								8814ae50c9 
								
							
								 
							
						 
						
							
							
								
								Fixed GTX_extended_min_max filename typo  #386  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								045e5bee1a 
								
							
								 
							
						 
						
							
							
								
								Improved GTC_reciprocal documentation  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								8e3e6108d5 
								
							
								 
							
						 
						
							
							
								
								Improved GTC_random linearRand documentations  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								1329c64f9b 
								
							
								 
							
						 
						
							
							
								
								Updated GLM version  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								d0c57e7afd 
								
							
								 
							
						 
						
							
							
								
								Revert  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								5e994bcf39 
								
							
								 
							
						 
						
							
							
								
								dummy.cpp CRLF->LF  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								11f05cea58 
								
							
								 
							
						 
						
							
							
								
								Fixed affineInverse test  #192  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								a4ed6568be 
								
							
								 
							
						 
						
							
							
								
								Fixed GTC_matrix_inverse affineInverse  #192  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								f384e18a78 
								
							
								 
							
						 
						
							
							
								
								Added tests for affineInverse  #192  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								e37fe66d5e 
								
							
								 
							
						 
						
							
							
								
								Fixed GTC_packing unpackUnorm3x10_1x2  #414  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								06ad5a2cd4 
								
							
								 
							
						 
						
							
							
								
								Fixed GTC_packing unpackUnorm3x10_1x2  #414  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								11bfa1eff7 
								
							
								 
							
						 
						
							
							
								
								Fixed GTC_round  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								8af1d0ce2d 
								
							
								 
							
						 
						
							
							
								
								Add test for floorMultiple/ceilMultiple (float only)  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								6789d897d2 
								
							
								 
							
						 
						
							
							
								
								Fix floorMultiple/ceilMultiple for float  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								b7ee25e227 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #423  from JesseTG/jtg/ignore-more  
							
							... 
							
							
 
							
							Small improvements to the .gitignore #423  
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								5ddeedc02c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #425  from arkana-fts/master  
							
							... 
							
							
 
							
							dummy.cpp CRLF->LF #425  
							
						 
						
							ago%!(EXTRA string=10 years)  
				
					
						
							
							
								 
						
							
							
								79ceca230f 
								
							
								 
							
						 
						
							
							
								
								Fixed compScale  
							
							
 
							
						 
						
							ago%!(EXTRA string=10 years)