From d6d27bcd4714c5c339a3959b6df4a57209f63e77 Mon Sep 17 00:00:00 2001
From: pklaschka <pabloklaschka@yahoo.de>
Date: Mon, 29 May 2017 19:44:35 +0200
Subject: [PATCH] Merge branch 'master' into Bestenliste

---
 .../Level/Test Monster Einfu\314\210gen.png"  | Bin 0 -> 109 bytes
 .../Test Monster Einfu\314\210gen.png.meta"   |  76 ++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 "Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png"
 create mode 100644 "Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png.meta"

diff --git "a/Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png" "b/Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d14475a7627f061d23e80798531c67a7e909cb22
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XEyROC<-t;PIplE
zZ=X^(zqxNhhFj5=Nx}>aX4)&)U40S#eD|NZX|G-~D4gV<(XV=6ZsYk6K>ZA!u6{1-
HoD!M<O2;HD

literal 0
HcmV?d00001

diff --git "a/Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png.meta" "b/Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png.meta"
new file mode 100644
index 0000000..3756183
--- /dev/null
+++ "b/Platformer_001/Assets/Level/Test Monster Einfu\314\210gen.png.meta"	
@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: 0981cf543ac8b0d4e8be07815555e01e
+timeCreated: 1494838044
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: