Merge branch 'master' of https://gitlab.utu.fi/eolokk/game_jam19

43fb2cbf · Kimi Heinonen · b2ba3448 · fa9ba6f8 · 43fb2cbf · 43fb2cbf
Commit 43fb2cbf authored Mar 3, 2019 by Kimi Heinonen
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -804,7 +804,7 @@ SpriteRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Sprite: {fileID: 21300000, guid: c6939f4198c63be4a87e89eddd28f522, type: 3}
-  m_Color: {r: 1, g: 0.9111515, b: 0.6084906, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
  m_DrawMode: 0

--- a/Assets/Sprites/TitleScreen.png.meta
+++ b/Assets/Sprites/TitleScreen.png.meta
@@ -31,7 +31,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 1
    aniso: -1
    mipBias: -100
    wrapU: 1
@@ -69,6 +69,17 @@ TextureImporter:
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []