joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7734432cc
							
						
					 | 
					
						
						
							
							branch from homebase, icebolt collision issues
						
						
						
						
						
						
					 | 
					
						2022-04-11 13:58:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccafc9e970
							
						
					 | 
					
						
						
							
							unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character
						
						
						
						
						
						
					 | 
					
						2022-04-05 10:21:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							af07a29f40
							
						
					 | 
					
						
						
							
							final changes
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:00:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							53bd10a13c
							
						
					 | 
					
						
						
							
							merge door to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:54:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb14e165d4
							
						
					 | 
					
						
						
							
							Door Interactions
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:48:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c10f3421f5
							
						
					 | 
					
						
						
							
							Merge branch 'Shumpei' into portals-and-body
						
						
						
						
						
						
						
						# Conflicts:
#	Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
#	Assets/Project Files/Scripts/Shumpei.meta
#	Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta 
						
						
					 | 
					
						2022-03-25 10:46:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0cb487d781
							
						
					 | 
					
						
						
							
							portal interaction and VR body
						
						
						
						
						
						
					 | 
					
						2022-03-24 18:02:34 +02:00 | 
					
					
						
						
							
							
							
						
					 |