Skip to content

Commit 89cb05d

Browse files
author
Malte Z. Andreasen
committed
Merge branch 'main' of github.com:MalteZA/MAES into release_2.0_galactic
2 parents 54e965a + e395263 commit 89cb05d

File tree

6 files changed

+109
-2
lines changed

6 files changed

+109
-2
lines changed

Assets/Resources/MAES icon.png

256 KB
Loading

Assets/Resources/MAES icon.png.meta

Lines changed: 98 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
579 KB
Binary file not shown.

Assets/Resources/MAES-icon.afdesign.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/MaesYamlConfigLoader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public static MaesConfigType LoadConfig() {
5656
}
5757

5858
var stream = new StreamReader(ConfigFileName);
59-
Debug.Log("Before deserializer");
6059
var deserializer = new DeserializerBuilder()
6160
.WithNamingConvention(UnderscoredNamingConvention.Instance)
6261
.Build();

ProjectSettings/ProjectSettings.asset

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,14 @@ PlayerSettings:
268268
AndroidMinifyDebug: 0
269269
AndroidValidateAppBundleSize: 1
270270
AndroidAppBundleSizeToValidate: 150
271-
m_BuildTargetIcons: []
271+
m_BuildTargetIcons:
272+
- m_BuildTarget:
273+
m_Icons:
274+
- serializedVersion: 2
275+
m_Icon: {fileID: 2800000, guid: 19e6247e286a547f58d19dadda68b5d6, type: 3}
276+
m_Width: 128
277+
m_Height: 128
278+
m_Kind: 0
272279
m_BuildTargetPlatformIcons: []
273280
m_BuildTargetBatching:
274281
- m_BuildTarget: Standalone

0 commit comments

Comments
 (0)