Jan Groß
|
998a52fe3c
|
Merge branch 'leveldesign_r'
# 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
|
2018-09-08 17:44:36 +02:00 |
|
Jan Groß
|
b778c14158
|
Polishing 1
General polishing commit
|
2018-09-08 16:45:03 +02:00 |
|
Jan Groß
|
497c653196
|
Beach and cave map update
|
2018-09-02 20:58:11 +02:00 |
|
Jan Groß
|
c7602b4988
|
Various Assets, beach and cave level
|
2018-09-02 16:03:58 +02:00 |
|