| 
						
					 | 
					
						
						
						
						
							
						
						
							51d75b196d
							
						
					 | 
					
						
						
							
							tree cut event
						
						
						
						
						
						
					 | 
					
						2022-04-04 16:09:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							e671f77c77
							
						
					 | 
					
						
						
							
							item stack pop item, minigame additem method
						
						
						
						
						
						
					 | 
					
						2022-04-03 09:40:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c539311caf
							
						
					 | 
					
						
						
							
							Merge branch 'staging' into portals-and-body
						
						
						
						
						
						
					 | 
					
						2022-03-29 09:30:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a71043121f
							
						
					 | 
					
						
						
							
							new character
						
						
						
						
						
						
					 | 
					
						2022-03-29 12:28:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bd4fcc0a0
							
						
					 | 
					
						
						
							
							joonasP scene missing prefabs replaced
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:36:04 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							99d412b258
							
						
					 | 
					
						
						
							
							merge minigame to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:52:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb14e165d4
							
						
					 | 
					
						
						
							
							Door Interactions
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:48:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							72401758e2
							
						
					 | 
					
						
						
							
							merge highlight to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:46:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							06fde8ab2e
							
						
					 | 
					
						
						
							
							minigame node particles and despawn timer
						
						
						
						
						
						
					 | 
					
						2022-03-28 12:52:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							8246a9ef8a
							
						
					 | 
					
						
						
							
							stackable inv objects, inv container
						
						
						
						
						
						
					 | 
					
						2022-03-28 10:08:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							851b7ae0da
							
						
					 | 
					
						
						
							
							essence minigame improvements
						
						
						
						
						
						
					 | 
					
						2022-03-25 18:03:38 +02: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c23213ad50
							
						
					 | 
					
						
						
							
							outline on hover
						
						
						
						
						
						
					 | 
					
						2022-03-21 18:36:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0649da5d3
							
						
					 | 
					
						
						
							
							sounds for prefabs
						
						
						
						
						
						
					 | 
					
						2022-03-21 17:52:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2e9f175bb
							
						
					 | 
					
						
						
							
							Arm-swing and joystick locomotion
						
						
						
						
						
						
					 | 
					
						2022-03-21 17:09:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f76431d855
							
						
					 | 
					
						
						
							
							panel to toggle nodding on/off
						
						
						
						
						
						
					 | 
					
						2022-03-19 22:29:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							22e4260521
							
						
					 | 
					
						
						
							
							lever improvements, ready to be used
						
						
						
						
						
						
					 | 
					
						2022-03-18 20:35:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f8245e798
							
						
					 | 
					
						
						
							
							Initial minigame testing in scene
						
						
						
						
						
						
					 | 
					
						2022-03-17 17:24:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2c0c3d9a1
							
						
					 | 
					
						
						
							
							lever prefab, haptic events and more comments in lever code
						
						
						
						
						
						
					 | 
					
						2022-03-16 22:16:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec8a34daf5
							
						
					 | 
					
						
						
							
							initial lever system
						
						
						
						
						
						
					 | 
					
						2022-03-15 20:07:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							670765ef3b
							
						
					 | 
					
						
						
							
							Update pack to URP
						
						
						
						
						
						
					 | 
					
						2022-03-14 18:14:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b9beee8f1
							
						
					 | 
					
						
						
							
							Merge and material conversion
						
						
						
						
						
						
					 | 
					
						2022-03-14 18:08:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							1041b946b6
							
						
					 | 
					
						
						
							
							final v2
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:52:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							884d399679
							
						
					 | 
					
						
						
							
							final
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:45:35 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							271d39c153
							
						
					 | 
					
						
						
							
							portals and dashing finalised
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:20:51 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Helar Jaadla
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbeb10ec35
							
						
					 | 
					
						
						
							
							clean project
						
						
						
						
						
						
					 | 
					
						2022-03-07 17:52:41 +02:00 | 
					
					
						
						
							
							
							
						
					 |