| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6cfaaf188
							
						
					 | 
					
						
						
							
							full body and animation, removed haptics that caused system crash
						
						
						
						
						
						
					 | 
					
						2022-03-24 22:50:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0cb487d781
							
						
					 | 
					
						
						
							
							portal interaction and VR body
						
						
						
						
						
						
					 | 
					
						2022-03-24 18:02:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2e9f175bb
							
						
					 | 
					
						
						
							
							Arm-swing and joystick locomotion
						
						
						
						
						
						
					 | 
					
						2022-03-21 17:09:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							f55009fc67
							
						
					 | 
					
						
						
							
							merge jonasty
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:45:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							54d7e65045
							
						
					 | 
					
						
						
							
							first
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:33:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							48ac923de2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/nodding-arlo' into staging
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:22:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							98dac07345
							
						
					 | 
					
						
						
							
							third person teleporting, grab interactables
						
						
						
						
						
						
					 | 
					
						2022-03-14 14:21:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							643b4e38ab
							
						
					 | 
					
						
						
							
							nodding movement, platform
						
						
						
						
						
						
					 | 
					
						2022-03-13 01:50:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e82799c36a
							
						
					 | 
					
						
						
							
							portals and dash. Also a bit of terrain building and level design
						
						
						
						
						
						
					 | 
					
						2022-03-13 00:26:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							b42bfd3c5e
							
						
					 | 
					
						
						
							
							Unity render pipeline upgrade, velocity based vignette system (may encounter problems on merge)
						
						
						
						
						
						
					 | 
					
						2022-03-12 21:38:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f48d160bd3
							
						
					 | 
					
						
						
							
							XR interaction toolkit holsters, flying with physics
						
						
						
						
						
						
					 | 
					
						2022-03-10 17:25:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab4fc2f635
							
						
					 | 
					
						
						
							
							added wand package, flying improvements
						
						
						
						
						
						
					 | 
					
						2022-03-10 13:49:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc0cc4cd32
							
						
					 | 
					
						
						
							
							Grabbing object and initial flying locomotion
						
						
						
						
						
						
					 | 
					
						2022-03-09 21:37:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							813cd0c451
							
						
					 | 
					
						
						
							
							init assets and filemgt
						
						
						
						
						
						
					 | 
					
						2022-03-07 18:33:30 +02:00 | 
					
					
						
						
							
							
							
						
					 |