diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index aecb5f851a..a35a23144b 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/core/assets/music/1.mp3 b/core/assets/music/1.mp3 deleted file mode 100644 index 711f236d49..0000000000 Binary files a/core/assets/music/1.mp3 and /dev/null differ diff --git a/core/assets/music/1.ogg b/core/assets/music/1.ogg new file mode 100644 index 0000000000..bb92288e32 Binary files /dev/null and b/core/assets/music/1.ogg differ diff --git a/core/assets/music/2.mp3 b/core/assets/music/2.mp3 deleted file mode 100644 index d25ee1052f..0000000000 Binary files a/core/assets/music/2.mp3 and /dev/null differ diff --git a/core/assets/music/2.ogg b/core/assets/music/2.ogg new file mode 100644 index 0000000000..a41c41249d Binary files /dev/null and b/core/assets/music/2.ogg differ diff --git a/core/assets/music/3.mp3 b/core/assets/music/3.mp3 deleted file mode 100644 index f67b58d985..0000000000 Binary files a/core/assets/music/3.mp3 and /dev/null differ diff --git a/core/assets/music/3.ogg b/core/assets/music/3.ogg new file mode 100644 index 0000000000..e19290f0e9 Binary files /dev/null and b/core/assets/music/3.ogg differ diff --git a/core/assets/music/4.mp3 b/core/assets/music/4.mp3 deleted file mode 100644 index 1caa836ccc..0000000000 Binary files a/core/assets/music/4.mp3 and /dev/null differ diff --git a/core/assets/music/4.ogg b/core/assets/music/4.ogg new file mode 100644 index 0000000000..0a5bff409e Binary files /dev/null and b/core/assets/music/4.ogg differ diff --git a/core/assets/music/place.wav b/core/assets/music/place.wav deleted file mode 100644 index f9f194d208..0000000000 Binary files a/core/assets/music/place.wav and /dev/null differ diff --git a/core/assets/music/shoot.wav b/core/assets/music/shoot.wav deleted file mode 100644 index df95d03a3c..0000000000 Binary files a/core/assets/music/shoot.wav and /dev/null differ diff --git a/core/assets/sounds/bang.ogg b/core/assets/sounds/bang.ogg new file mode 100644 index 0000000000..9f8de5b434 Binary files /dev/null and b/core/assets/sounds/bang.ogg differ diff --git a/core/assets/sounds/bang.wav b/core/assets/sounds/bang.wav deleted file mode 100644 index a88d7f5fb2..0000000000 Binary files a/core/assets/sounds/bang.wav and /dev/null differ diff --git a/core/assets/sounds/bang2.ogg b/core/assets/sounds/bang2.ogg new file mode 100644 index 0000000000..6e744bbacf Binary files /dev/null and b/core/assets/sounds/bang2.ogg differ diff --git a/core/assets/sounds/bang2.wav b/core/assets/sounds/bang2.wav deleted file mode 100644 index 821a4de9b0..0000000000 Binary files a/core/assets/sounds/bang2.wav and /dev/null differ diff --git a/core/assets/sounds/bigshot.ogg b/core/assets/sounds/bigshot.ogg new file mode 100644 index 0000000000..764d0ff910 Binary files /dev/null and b/core/assets/sounds/bigshot.ogg differ diff --git a/core/assets/sounds/bigshot.wav b/core/assets/sounds/bigshot.wav deleted file mode 100644 index 4b92e37086..0000000000 Binary files a/core/assets/sounds/bigshot.wav and /dev/null differ diff --git a/core/assets/sounds/blast.ogg b/core/assets/sounds/blast.ogg new file mode 100644 index 0000000000..c772039289 Binary files /dev/null and b/core/assets/sounds/blast.ogg differ diff --git a/core/assets/sounds/blast.wav b/core/assets/sounds/blast.wav deleted file mode 100644 index d0d4856cdc..0000000000 Binary files a/core/assets/sounds/blast.wav and /dev/null differ diff --git a/core/assets/sounds/bloop.ogg b/core/assets/sounds/bloop.ogg new file mode 100644 index 0000000000..d07415f877 Binary files /dev/null and b/core/assets/sounds/bloop.ogg differ diff --git a/core/assets/sounds/bloop.wav b/core/assets/sounds/bloop.wav deleted file mode 100644 index 09a3463c89..0000000000 Binary files a/core/assets/sounds/bloop.wav and /dev/null differ diff --git a/core/assets/sounds/break.ogg b/core/assets/sounds/break.ogg new file mode 100644 index 0000000000..96e51cfefe Binary files /dev/null and b/core/assets/sounds/break.ogg differ diff --git a/core/assets/sounds/break.wav b/core/assets/sounds/break.wav deleted file mode 100644 index 12037628a4..0000000000 Binary files a/core/assets/sounds/break.wav and /dev/null differ diff --git a/core/assets/sounds/corexplode.ogg b/core/assets/sounds/corexplode.ogg new file mode 100644 index 0000000000..94babbb4e8 Binary files /dev/null and b/core/assets/sounds/corexplode.ogg differ diff --git a/core/assets/sounds/corexplode.wav b/core/assets/sounds/corexplode.wav deleted file mode 100644 index f54b2b0c1b..0000000000 Binary files a/core/assets/sounds/corexplode.wav and /dev/null differ diff --git a/core/assets/sounds/die.ogg b/core/assets/sounds/die.ogg new file mode 100644 index 0000000000..d4520c4f11 Binary files /dev/null and b/core/assets/sounds/die.ogg differ diff --git a/core/assets/sounds/die.wav b/core/assets/sounds/die.wav deleted file mode 100644 index b41b8ae317..0000000000 Binary files a/core/assets/sounds/die.wav and /dev/null differ diff --git a/core/assets/sounds/enemyshoot.ogg b/core/assets/sounds/enemyshoot.ogg new file mode 100644 index 0000000000..7b8911baef Binary files /dev/null and b/core/assets/sounds/enemyshoot.ogg differ diff --git a/core/assets/sounds/enemyshoot.wav b/core/assets/sounds/enemyshoot.wav deleted file mode 100644 index 875955c923..0000000000 Binary files a/core/assets/sounds/enemyshoot.wav and /dev/null differ diff --git a/core/assets/sounds/explosion.ogg b/core/assets/sounds/explosion.ogg new file mode 100644 index 0000000000..e0992f0555 Binary files /dev/null and b/core/assets/sounds/explosion.ogg differ diff --git a/core/assets/sounds/explosion.wav b/core/assets/sounds/explosion.wav deleted file mode 100644 index b21bca5af9..0000000000 Binary files a/core/assets/sounds/explosion.wav and /dev/null differ diff --git a/core/assets/sounds/flame.ogg b/core/assets/sounds/flame.ogg new file mode 100644 index 0000000000..35aa016ef5 Binary files /dev/null and b/core/assets/sounds/flame.ogg differ diff --git a/core/assets/sounds/flame.wav b/core/assets/sounds/flame.wav deleted file mode 100644 index 3d92dc27b0..0000000000 Binary files a/core/assets/sounds/flame.wav and /dev/null differ diff --git a/core/assets/sounds/flame2.ogg b/core/assets/sounds/flame2.ogg new file mode 100644 index 0000000000..b0343457e5 Binary files /dev/null and b/core/assets/sounds/flame2.ogg differ diff --git a/core/assets/sounds/flame2.wav b/core/assets/sounds/flame2.wav deleted file mode 100644 index 54fc72a157..0000000000 Binary files a/core/assets/sounds/flame2.wav and /dev/null differ diff --git a/core/assets/sounds/laser.ogg b/core/assets/sounds/laser.ogg new file mode 100644 index 0000000000..8b0d5ccdcf Binary files /dev/null and b/core/assets/sounds/laser.ogg differ diff --git a/core/assets/sounds/laser.wav b/core/assets/sounds/laser.wav deleted file mode 100644 index 4165915464..0000000000 Binary files a/core/assets/sounds/laser.wav and /dev/null differ diff --git a/core/assets/sounds/lasershot.ogg b/core/assets/sounds/lasershot.ogg new file mode 100644 index 0000000000..f22a189e27 Binary files /dev/null and b/core/assets/sounds/lasershot.ogg differ diff --git a/core/assets/sounds/lasershot.wav b/core/assets/sounds/lasershot.wav deleted file mode 100644 index 2e8d49514f..0000000000 Binary files a/core/assets/sounds/lasershot.wav and /dev/null differ diff --git a/core/assets/sounds/missile.ogg b/core/assets/sounds/missile.ogg new file mode 100644 index 0000000000..8c35b516cd Binary files /dev/null and b/core/assets/sounds/missile.ogg differ diff --git a/core/assets/sounds/missile.wav b/core/assets/sounds/missile.wav deleted file mode 100644 index 696dc26e57..0000000000 Binary files a/core/assets/sounds/missile.wav and /dev/null differ diff --git a/core/assets/sounds/ping.ogg b/core/assets/sounds/ping.ogg new file mode 100644 index 0000000000..c3e797cebb Binary files /dev/null and b/core/assets/sounds/ping.ogg differ diff --git a/core/assets/sounds/ping.wav b/core/assets/sounds/ping.wav deleted file mode 100644 index 60cd945a8f..0000000000 Binary files a/core/assets/sounds/ping.wav and /dev/null differ diff --git a/core/assets/sounds/place.ogg b/core/assets/sounds/place.ogg new file mode 100644 index 0000000000..cb7d26844b Binary files /dev/null and b/core/assets/sounds/place.ogg differ diff --git a/core/assets/sounds/place.wav b/core/assets/sounds/place.wav deleted file mode 100644 index f9f194d208..0000000000 Binary files a/core/assets/sounds/place.wav and /dev/null differ diff --git a/core/assets/sounds/purchase.ogg b/core/assets/sounds/purchase.ogg new file mode 100644 index 0000000000..fe43a21926 Binary files /dev/null and b/core/assets/sounds/purchase.ogg differ diff --git a/core/assets/sounds/purchase.wav b/core/assets/sounds/purchase.wav deleted file mode 100644 index 1ab87f4612..0000000000 Binary files a/core/assets/sounds/purchase.wav and /dev/null differ diff --git a/core/assets/sounds/railgun.ogg b/core/assets/sounds/railgun.ogg new file mode 100644 index 0000000000..75a4ea886b Binary files /dev/null and b/core/assets/sounds/railgun.ogg differ diff --git a/core/assets/sounds/railgun.wav b/core/assets/sounds/railgun.wav deleted file mode 100644 index eb8f85f2b4..0000000000 Binary files a/core/assets/sounds/railgun.wav and /dev/null differ diff --git a/core/assets/sounds/resonate.ogg b/core/assets/sounds/resonate.ogg new file mode 100644 index 0000000000..4ba46f9fb7 Binary files /dev/null and b/core/assets/sounds/resonate.ogg differ diff --git a/core/assets/sounds/resonate.wav b/core/assets/sounds/resonate.wav deleted file mode 100644 index 35609fe11c..0000000000 Binary files a/core/assets/sounds/resonate.wav and /dev/null differ diff --git a/core/assets/sounds/respawn.ogg b/core/assets/sounds/respawn.ogg new file mode 100644 index 0000000000..bba099421c Binary files /dev/null and b/core/assets/sounds/respawn.ogg differ diff --git a/core/assets/sounds/respawn.wav b/core/assets/sounds/respawn.wav deleted file mode 100644 index aeb8b0d2d1..0000000000 Binary files a/core/assets/sounds/respawn.wav and /dev/null differ diff --git a/core/assets/sounds/shoot.ogg b/core/assets/sounds/shoot.ogg new file mode 100644 index 0000000000..bd1986d256 Binary files /dev/null and b/core/assets/sounds/shoot.ogg differ diff --git a/core/assets/sounds/shoot.wav b/core/assets/sounds/shoot.wav deleted file mode 100644 index d54fe57302..0000000000 Binary files a/core/assets/sounds/shoot.wav and /dev/null differ diff --git a/core/assets/sounds/shoot_old.ogg b/core/assets/sounds/shoot_old.ogg new file mode 100644 index 0000000000..cdd2363d23 Binary files /dev/null and b/core/assets/sounds/shoot_old.ogg differ diff --git a/core/assets/sounds/shoot_old.wav b/core/assets/sounds/shoot_old.wav deleted file mode 100644 index df95d03a3c..0000000000 Binary files a/core/assets/sounds/shoot_old.wav and /dev/null differ diff --git a/core/assets/sounds/spawn.ogg b/core/assets/sounds/spawn.ogg new file mode 100644 index 0000000000..0f62d2655a Binary files /dev/null and b/core/assets/sounds/spawn.ogg differ diff --git a/core/assets/sounds/spawn.wav b/core/assets/sounds/spawn.wav deleted file mode 100644 index 140461a2ec..0000000000 Binary files a/core/assets/sounds/spawn.wav and /dev/null differ diff --git a/core/assets/sounds/tesla.ogg b/core/assets/sounds/tesla.ogg new file mode 100644 index 0000000000..f6da103775 Binary files /dev/null and b/core/assets/sounds/tesla.ogg differ diff --git a/core/assets/sounds/tesla.wav b/core/assets/sounds/tesla.wav deleted file mode 100644 index 19316e1152..0000000000 Binary files a/core/assets/sounds/tesla.wav and /dev/null differ diff --git a/core/assets/sounds/waveend.ogg b/core/assets/sounds/waveend.ogg new file mode 100644 index 0000000000..6c20f4eed3 Binary files /dev/null and b/core/assets/sounds/waveend.ogg differ diff --git a/core/assets/sounds/waveend.wav b/core/assets/sounds/waveend.wav deleted file mode 100644 index 78cf77e41e..0000000000 Binary files a/core/assets/sounds/waveend.wav and /dev/null differ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 939044289a..a3d157bbc2 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -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, diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditor.java b/core/src/io/anuke/mindustry/mapeditor/MapEditor.java index 060bdc44eb..9d41eafdfb 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapEditor.java +++ b/core/src/io/anuke/mindustry/mapeditor/MapEditor.java @@ -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){ diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java index b3da5ffa31..71257d831a 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java @@ -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); }); } diff --git a/core/src/io/anuke/mindustry/mapeditor/MapSaveDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapSaveDialog.java index cdfd6684de..5e2d8d08cb 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapSaveDialog.java +++ b/core/src/io/anuke/mindustry/mapeditor/MapSaveDialog.java @@ -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(() ->{