helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

merge minigame to staging

Browse Source
This commit is contained in:
HelarJ
2022-03-28 16:52:34 +03:00
parent 72401758e2 06fde8ab2e
commit 99d412b258
29 changed files with 7505 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
guid: d427f0f5ff0359f4c92a56ed37a11542
========
guid: 8f5582064724dbc45bc5c3432899f9c1
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
PrefabImporter:
externalObjects: {}
userData: