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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1784

Assets/Scenes/Level_Cave.unity

File diff suppressed because it is too large Load Diff