Skip to content
Snippets Groups Projects
Commit d83fee06 authored by Luboš Horáček's avatar Luboš Horáček
Browse files

Merge branch 'devel' into feature-gamemenu

Conflicts:
	ios/src/cz/nic/tablexia/IOSLauncher.java
parents 87030869 a51600f2
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,7 @@ public class DesktopLauncher {
config.addIcon(DESKTOP_ICON_128, Files.FileType.Internal);
}
new LwjglApplication(new Tablexia(buildType, Locale.getDefault(), versionName, applicationId, false), config);
new LwjglApplication(new Tablexia(buildType, Locale.getDefault(), versionName, applicationId, true), config);
}
private static String loadAttributeFromManifest(String attributeName) {
......
......@@ -21,6 +21,7 @@ public class IOSLauncher extends IOSApplication.Delegate {
String versionName = infoDictionary.get(new NSString("CFBundleShortVersionString")).toString();
String applicationId = infoDictionary.get(new NSString("CFBundleIdentifier")).toString();
//TODO check application state
return new IOSApplication(new Tablexia(buildType, Locale.getDefault(), versionName, applicationId, false), config);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment