diff --git a/build.gradle b/build.gradle index c52f703dbb..96a02e20d7 100644 --- a/build.gradle +++ b/build.gradle @@ -144,8 +144,7 @@ project(":ios") { } robovm { - iosSignIdentity = "a" - iosProvisioningProfile = "" + } } diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index e55b3502e7..2bab36fc3a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1,4 +1,4 @@ -text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]Roccow[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n +text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]a beat a day[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n text.credits=Credits text.discord=Join the mindustry discord! text.changes=[SCARLET]Attention!\n[]Some important game mechanics have been changed.\n\n- [accent]Teleporters[] now use power.\n- [accent]Smelteries[] and [accent]crucibles[] now have a maximum item capacity.\n- [accent]Crucibles[] now require coal as fuel. diff --git a/core/assets/music/1.mp3 b/core/assets/music/1.mp3 old mode 100644 new mode 100755 index 642338935e..cdbb366b48 Binary files a/core/assets/music/1.mp3 and b/core/assets/music/1.mp3 differ diff --git a/core/assets/music/2.mp3 b/core/assets/music/2.mp3 old mode 100644 new mode 100755 index 8a40164ad5..cab7d699eb Binary files a/core/assets/music/2.mp3 and b/core/assets/music/2.mp3 differ diff --git a/core/assets/music/3.mp3 b/core/assets/music/3.mp3 old mode 100644 new mode 100755 index 1586984c2d..f03d72bbcc Binary files a/core/assets/music/3.mp3 and b/core/assets/music/3.mp3 differ diff --git a/core/assets/music/4.mp3 b/core/assets/music/4.mp3 old mode 100644 new mode 100755 index 8f1998b9c8..48c4ff24fc Binary files a/core/assets/music/4.mp3 and b/core/assets/music/4.mp3 differ diff --git a/core/assets/music/5.mp3 b/core/assets/music/5.mp3 new file mode 100755 index 0000000000..65a5034fbf Binary files /dev/null and b/core/assets/music/5.mp3 differ diff --git a/core/assets/music/6.mp3 b/core/assets/music/6.mp3 new file mode 100755 index 0000000000..88f04f33a8 Binary files /dev/null and b/core/assets/music/6.mp3 differ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index c991873609..213c98d4c5 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -102,7 +102,7 @@ public class Control extends Module{ Sounds.setFalloff(9000f); - Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3"); + Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3", "5.mp3", "6.mp3"); DefaultKeybinds.load(); diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 048a1c6319..0c81d425c8 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -28,6 +28,8 @@ UIStatusBarHidden + UIRequiresFullScreen + UIDeviceFamily 1 @@ -49,8 +51,8 @@ CFBundleIconFiles - Icon - Icon-72 + icon + icon-72