Skip to content

Commit

Permalink
Changed music back
Browse files Browse the repository at this point in the history
  • Loading branch information
Anuken committed May 5, 2018
1 parent b496f51 commit f7e0dc4
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
text.about=Created by [ROYAL]Anuken[] - [SKY][email protected][]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]a drop 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.about=Created by [ROYAL]Anuken[] - [SKY][email protected][]\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.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.
Expand Down
Binary file modified core/assets/music/1.mp3
Binary file not shown.
Binary file modified core/assets/music/2.mp3
Binary file not shown.
Binary file modified core/assets/music/3.mp3
Binary file not shown.
Binary file modified core/assets/music/4.mp3
Binary file not shown.
Binary file removed core/assets/music/5.mp3
Binary file not shown.
Binary file removed core/assets/music/6.mp3
Binary file not shown.
2 changes: 1 addition & 1 deletion core/src/io/anuke/mindustry/core/Control.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public int getX(int pointer) {

Sounds.setFalloff(9000f);

Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3", "5.mp3", "6.mp3");
Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3");

DefaultKeybinds.load();

Expand Down

0 comments on commit f7e0dc4

Please sign in to comment.