Merge branch 'main' of github.com:MalteZA/MAES into release_2.0_galactic

DEIS-Tools · Jun 2, 2022 · 89cb05d · 89cb05d
2 parents 54e965a + e395263
commit 89cb05d
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 2 deletions.
diff --git a/Assets/Resources/MAES icon.png b/Assets/Resources/MAES icon.png
diff --git a/Assets/Resources/MAES icon.png.meta b/Assets/Resources/MAES icon.png.meta
diff --git a/Assets/Resources/MAES-icon.afdesign b/Assets/Resources/MAES-icon.afdesign
diff --git a/Assets/Resources/MAES-icon.afdesign.meta b/Assets/Resources/MAES-icon.afdesign.meta
diff --git a/Assets/Scripts/MaesYamlConfigLoader.cs b/Assets/Scripts/MaesYamlConfigLoader.cs
@@ -56,7 +56,6 @@ public static MaesConfigType LoadConfig() {
             }
 
             var stream = new StreamReader(ConfigFileName);
-            Debug.Log("Before deserializer");
             var deserializer = new DeserializerBuilder()
                 .WithNamingConvention(UnderscoredNamingConvention.Instance)
                 .Build(); 

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -268,7 +268,14 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 19e6247e286a547f58d19dadda68b5d6, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone