KittenBox/lurchvolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'leveldesign_r'

Browse Source 
# Conflicts:
#	Assets/Blender/longplateau_horizontal.blend.meta
#	Assets/Blender/rock_wall_edge.blend.meta
#	Assets/Blender/rock_wall_ridge.blend.meta
#	Assets/Blender/rock_wall_stepped.blend.meta
#	Assets/Blender/rocks01.blend.meta
#	Assets/Blender/spikertap1.blend.meta
#	Assets/Blender/tree_platform.blend.meta
#	Assets/Blender/tree_tops.blend.meta
#	Assets/Blender/trees_with_trunks.blend.meta
#	Assets/Blender/waves.blend.meta
#	Assets/Materials/Sprites.meta
#	Assets/Scenes/Level_Cave.unity
This commit is contained in:
Jan Groß
2018-09-08 17:44:36 +02:00
parent 7c7757be99 b778c14158
commit 998a52fe3c
209 changed files with 59813 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Blender/rock_wall_stepped.blend.meta
View File

@@ -1,16 +1,26 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 743de541888a4014c912500b676649b4
=======
guid: 743de541888a4014c912500b676649b4
>>>>>>> leveldesign_r
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
<<<<<<< HEAD
2100000: Rock
2100002: Top
=======
2100000: Material
2100002: Rock
2100004: Top
>>>>>>> leveldesign_r
2300000: //RootNode
3300000: //RootNode
4300000: Cube