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

merge door to staging

Browse Source
This commit is contained in:
HelarJ
2022-03-28 16:54:50 +03:00
parent 99d412b258 fb14e165d4
commit 53bd10a13c
1331 changed files with 410263 additions and 5190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46005
Assets/Scenes/JonasB/Dungeon.unity Normal file
View File

File diff suppressed because it is too large Load Diff

12
Assets/Scenes/JonasB/Dungeon.unity.meta Normal file
View File

@@ -0,0 +1,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta
guid: b609e3c6adb2d2b4196415d93e789ddd
PrefabImporter:
========
guid: f6d31dc9e750063448915a12546cf689
DefaultImporter:
>>>>>>>> origin/DoorInteration:Assets/Scenes/JonasB/Dungeon.unity.meta
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5489
Assets/Scenes/JonasB/Portals.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scenes/JonasB/TerrainTest.unity
View File

@@ -39,7 +39,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_IndirectSpecularColor: {r: 0.040561177, g: 0.04676315, b: 0.07789096, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -16112,7 +16112,7 @@ GameObject:
m_Component:
- component: {fileID: 1984552581}
m_Layer: 0
m_Name: GameManagementTool
m_Name: GameManagement
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0