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

32
Assets/Blender/waves.blend.meta
View File

@@ -1,7 +1,11 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: be524af1caf68134f82b9c43ce1db13e
=======
guid: be524af1caf68134f82b9c43ce1db13e
>>>>>>> leveldesign_r
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
@@ -10,52 +14,80 @@ ModelImporter:
100004: Cube_002
100006: Cube_003
100008: Cube_004
<<<<<<< HEAD
100010: Cube_005
100012: Cube_006
100014: //RootNode
r
=======
100010: Cube_005
100012: Cube_006
100014: //RootNode
>>>>>>> leveldesign_r
400000: Cube_000
400002: Cube_001
400004: Cube_002
400006: Cube_003
400008: Cube_004
<<<<<<< HEAD
400010: Cube_005
400012: Cube_006
400014: //RootNode
=======
400010: Cube_005
400012: Cube_006
400014: //RootNode
>>>>>>> leveldesign_r
2100000: unnamed
2300000: Cube_000
2300002: Cube_001
2300004: Cube_002
2300006: Cube_003
2300008: Cube_004
<<<<<<< HEAD
2300010: Cube_005
2300012: Cube_006
=======
2300010: Cube_005
2300012: Cube_006
>>>>>>> leveldesign_r
3300000: Cube_000
3300002: Cube_001
3300004: Cube_002
3300006: Cube_003
3300008: Cube_004
<<<<<<< HEAD
3300010: Cube_005
3300012: Cube_006
=======
3300010: Cube_005
3300012: Cube_006
>>>>>>> leveldesign_r
4300000: Cube_006
4300002: Cube_004
4300004: Cube_003
4300006: Cube_002
4300008: Cube_001
4300010: Cube_000
<<<<<<< HEAD
=======
>>>>>>> leveldesign_r
4300012: Cube_005
7400000: Default Take
9500000: //RootNode
2186277476908879412: ImportLogs
<<<<<<< HEAD
=======
>>>>>>> leveldesign_r
externalObjects: {}
materials:
importMaterials: 1