HelarJ cd1633af54 Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2 ...

# Conflicts:
#	Assets/SkyProfile-457889269655148736.asset
#	Assets/_TerrainData/TerrainData_521113671563848736.asset
#	Assets/_TerrainData/TerrainData_699485723238748736.asset
#	Assets/_TerrainData/TerrainData_869121471408748736.asset
#	Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
#	Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
#	Assets/_TerrainData/TerrainMaterial_869121471408748736.mat

2022-04-11 18:53:05 +03:00

..

Arlo

merge commit

2022-04-11 18:46:10 +03:00

Helar

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

JonasB

merge commit

2022-04-11 18:46:10 +03:00

JoonasP

essence add to playerinfo

2022-04-11 18:27:18 +03:00

Shumpei

Door Interactions

2022-03-28 16:48:27 +03:00

Arlo.meta

nodding movement, platform

2022-03-13 01:50:13 +02:00

HandAnim.cs

hand animations

2022-04-08 23:38:29 +03:00

HandAnim.cs.meta

hand animations

2022-04-08 23:38:29 +03:00

Helar.meta

third person teleporting, grab interactables

2022-03-14 14:21:24 +02:00

JonasB.meta

init assets and filemgt

2022-03-07 18:33:30 +02:00

JoonasP.meta

Grabbing object and initial flying locomotion

2022-03-09 21:37:11 +02:00

Shumpei.meta

Door Interactions

2022-03-28 16:48:27 +03:00