Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert audio files to ogg

Browse Source
This commit is contained in:
Anuken
2017-12-20 11:39:21 -05:00
parent 0acb911577
commit 707d164678
67 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -90,14 +90,14 @@ public class Control extends Module{
Core.atlas = new Atlas("sprites.atlas");
Sounds.load("shoot.wav", "place.wav", "explosion.wav", "enemyshoot.wav",
"corexplode.wav", "break.wav", "spawn.wav", "flame.wav", "die.wav",
"respawn.wav", "purchase.wav", "flame2.wav", "bigshot.wav", "laser.wav", "lasershot.wav",
"ping.wav", "tesla.wav", "waveend.wav", "railgun.wav", "blast.wav", "bang2.wav");
Sounds.load("shoot.ogg", "place.ogg", "explosion.ogg", "enemyshoot.ogg",
"corexplode.ogg", "break.ogg", "spawn.ogg", "flame.ogg", "die.ogg",
"respawn.ogg", "purchase.ogg", "flame2.ogg", "bigshot.ogg", "laser.ogg", "lasershot.ogg",
"ping.ogg", "tesla.ogg", "waveend.ogg", "railgun.ogg", "blast.ogg", "bang2.ogg");
Sounds.setFalloff(9000f);
Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3");
Musics.load("1.ogg", "2.ogg", "3.ogg", "4.ogg");
KeyBinds.defaults(
"up", Keys.W,

1
core/src/io/anuke/mindustry/mapeditor/MapEditor.java
View File

@@ -81,6 +81,7 @@ public class MapEditor{
}
public void beginEdit(Map map){
drawBlock = Blocks.stone;
this.map = map;
this.brushSize = 1;
if(map.pixmap == null){

1
core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
View File

@@ -128,6 +128,7 @@ public class MapEditorDialog extends Dialog{
shown(() -> {
saved = true;
editor.beginEdit(new Map());
blockgroup.getButtons().get(2).setChecked(true);
Core.scene.setScrollFocus(view);
});
}

3
core/src/io/anuke/mindustry/mapeditor/MapSaveDialog.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.mapeditor;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.ui.FloatingDialog;
import io.anuke.mindustry.world.Map;
@@ -14,6 +15,8 @@ public class MapSaveDialog extends FloatingDialog{
super("Save Map");
field = new TextField();
Mindustry.platforms.addDialog(field);
shown(() -> {
content().clear();
content().label(() ->{