Convert audio files to ogg

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

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.anuke.mindustry"
android:versionCode="39"
android:versionCode="41"
android:versionName="3.2b" >
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />

Binary file not shown.

BIN
core/assets/music/1.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
core/assets/music/2.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
core/assets/music/3.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
core/assets/music/4.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
core/assets/sounds/bang.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
core/assets/sounds/die.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
core/assets/sounds/ping.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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,

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){

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);
});
}

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(() ->{