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

Merge remote-tracking branch 'origin/gesture_joonasp'

Browse Source 
# 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
This commit is contained in:
HelarJ
2022-04-25 16:17:38 +03:00
parent 34035c5b3d 73dd34ba61
commit c085a629af
32 changed files with 11075 additions and 44160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/JoonasP/Homebase_JP.unity
+1802 -8004
View File
File diff suppressed because one or more lines are too long
Assets/Scenes/JoonasP/Homebase_JoonasP.unity
-36087
View File
File diff suppressed because one or more lines are too long
Assets/Scenes/JoonasP/Homebase_JoonasP.unity.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: b5e52a1ec3144c3698b70a852c266400
timeCreated: 1649692466