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

final changes

Browse Source
This commit is contained in:
HelarJ 2022-03-28 17:00:22 +03:00
parent 53bd10a13c
commit af07a29f40
12 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta <<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
guid: f23712c79adc910408e872b127e825cf guid: 96e0f305ff8e6e24fa04570a5e239535
timeCreated: 1522615825 timeCreated: 1522615825
licenseType: Store licenseType: Store
======== ========

2
Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/QuickOutline/Resources.meta <<<<<<<< HEAD:Assets/QuickOutline/Resources.meta
guid: 70fd40674751a8042a8b9b2e8d9f915f guid: 3e7161d0fb662244a9a6c1e02c2df1d5
folderAsset: yes folderAsset: yes
timeCreated: 1522559128 timeCreated: 1522559128
licenseType: Store licenseType: Store

8
Assets/Project Files/Prefabs/Arlo.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cf9fd337edc6b034da268d1306e045a9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
guid: d427f0f5ff0359f4c92a56ed37a11542 guid: c89fd30ca0b56fb41a415d285d87b219
======== ========
guid: 8f5582064724dbc45bc5c3432899f9c1 guid: 8f5582064724dbc45bc5c3432899f9c1
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta

2
Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta <<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta
guid: c509c0c7d8d7f2942a05792798d31fc0 guid: 215fe2a51d12ecc43ba8f86d3dc3ae54
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
======== ========

2
Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Resources/Helar.meta <<<<<<<< HEAD:Assets/Resources/Helar.meta
guid: af818d2fbe0b12e4794f02d093a8d1c5 guid: 551c14077760549478d9927a77d319ee
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
======== ========

2
Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
guid: d427f0f5ff0359f4c92a56ed37a11542 guid: cb8b19b563b3d224897e3b3d94c353aa
======== ========
guid: 8f5582064724dbc45bc5c3432899f9c1 guid: 8f5582064724dbc45bc5c3432899f9c1
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta

8
Assets/Project Files/Shaders/Arlo.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a4eb55eb68b1d974a97ac0f260dcf964
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/QuickOutline.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e2a31ff500d2574b958693daad5e3e7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/QuickOutline/Resources.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/QuickOutline/Resources.meta <<<<<<<< HEAD:Assets/QuickOutline/Resources.meta
guid: 70fd40674751a8042a8b9b2e8d9f915f guid: 7d0f280d232462b4d962e047022e5e3c
folderAsset: yes folderAsset: yes
timeCreated: 1522559128 timeCreated: 1522559128
licenseType: Store licenseType: Store

2
Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta <<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
guid: f23712c79adc910408e872b127e825cf guid: 4e04f58b1862b1d4f91c80b974e32fe8
timeCreated: 1522615825 timeCreated: 1522615825
licenseType: Store licenseType: Store
======== ========

2
Assets/Scenes/JonasB/Dungeon.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta <<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta
guid: b609e3c6adb2d2b4196415d93e789ddd guid: d28d613c510a3b449a9070c2eb2b61c0
PrefabImporter: PrefabImporter:
======== ========
guid: f6d31dc9e750063448915a12546cf689 guid: f6d31dc9e750063448915a12546cf689