HelarJ c085a629af Merge remote-tracking branch 'origin/gesture_joonasp' ...

# Conflicts:
#	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
#	ProjectSettings/EditorBuildSettings.asset

2022-04-25 16:17:38 +03:00

..

Arlo

slime AI

2022-04-18 03:08:12 +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

crafting tweaks

2022-04-25 16:06:41 +03:00

Shumpei

merge arlo

2022-04-11 19:13:05 +03:00

Arlo.meta

init assets and filemgt

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

CombatScene.unity

added spawns for slimes, boss slime added. blocker for final area added + key to unlock

2022-04-25 15:29:04 +03:00

CombatScene.unity.meta

combatlevel world done | adjusts in portal script to allow for scenemanagement | waiting for ai to finish. need to write enemy spawner scripts

2022-04-17 22:18:13 +03:00

Helar.meta

init assets and filemgt

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

Homebase.unity

added spawns for slimes, boss slime added. blocker for final area added + key to unlock

2022-04-25 15:29:04 +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