Merge branch 'master' into Bestenliste

pklaschka · May 29, 2017 · f88e78b · f88e78b
2 parents e0cc9d3 + 92aa715
commit f88e78b
Show file tree

Hide file tree

Showing 23 changed files with 579 additions and 8 deletions.
diff --git a/Platformer_001/Assets/Level.meta b/Platformer_001/Assets/Level.meta
diff --git a/Platformer_001/Assets/Level/Level 1 V.2.png b/Platformer_001/Assets/Level/Level 1 V.2.png
diff --git a/Platformer_001/Assets/Level/Level 1 V.2.png.meta b/Platformer_001/Assets/Level/Level 1 V.2.png.meta
diff --git a/Platformer_001/Assets/Level/Level 1 V1.png b/Platformer_001/Assets/Level/Level 1 V1.png
diff --git a/Platformer_001/Assets/Level/Level 1 V1.png.meta b/Platformer_001/Assets/Level/Level 1 V1.png.meta
diff --git a/Platformer_001/Assets/Level/Level 1.png b/Platformer_001/Assets/Level/Level 1.png
diff --git a/Platformer_001/Assets/Level/Level 1.png.meta b/Platformer_001/Assets/Level/Level 1.png.meta
diff --git a/Platformer_001/Assets/Level/Level V.3.png b/Platformer_001/Assets/Level/Level V.3.png
diff --git a/Platformer_001/Assets/Level/Level V.3.png.meta b/Platformer_001/Assets/Level/Level V.3.png.meta
diff --git a/Platformer_001/Assets/Level/Test Monster Einfügen.png b/Platformer_001/Assets/Level/Test Monster Einfügen.png
diff --git a/Platformer_001/Assets/Level/Test Monster Einfügen.png.meta b/Platformer_001/Assets/Level/Test Monster Einfügen.png.meta