HelarJ fd4432fc6d Merge remote-tracking branch 'origin/PauseMenu' into staging2 ...

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/TagManager.asset

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

..

Arlo

tree cut event

2022-04-04 16:09:59 +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

merge joonasp's branches

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

Shumpei

Changed to portal transition

2022-04-11 17:19:41 +03:00

Arlo.meta

init assets and filemgt

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

Helar.meta

init assets and filemgt

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

Homebase.unity

merge commit

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

Homebase.unity.meta

homebase done portal room done

2022-04-05 20:53:02 +03:00

JonasB.meta

init assets and filemgt

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

JoonasP.meta

init assets and filemgt

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

Shumpei.meta

Arm-swing and joystick locomotion

2022-03-21 17:09:21 +02:00

Unified_Scene.unity

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

Unified_Scene.unity.meta

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