Merge remote-tracking branch 'origin/master'

2018-04-27 23:43:32 -04:00
parent 8cc3a865e2 8a13482c38
commit 59fe8f444f
62 changed files with 8 additions and 6 deletions
--- a/core/assets/music/1.mp3
+++ b/core/assets/music/1.mp3
--- a/core/assets/music/1.ogg
+++ b/core/assets/music/1.ogg
--- a/core/assets/music/2.mp3
+++ b/core/assets/music/2.mp3
--- a/core/assets/music/2.ogg
+++ b/core/assets/music/2.ogg
--- a/core/assets/music/3.mp3
+++ b/core/assets/music/3.mp3
--- a/core/assets/music/3.ogg
+++ b/core/assets/music/3.ogg
--- a/core/assets/music/4.mp3
+++ b/core/assets/music/4.mp3
--- a/core/assets/music/4.ogg
+++ b/core/assets/music/4.ogg
--- a/core/assets/sounds/bang.mp3
+++ b/core/assets/sounds/bang.mp3
--- a/core/assets/sounds/bang.ogg
+++ b/core/assets/sounds/bang.ogg
--- a/core/assets/sounds/bang2.mp3
+++ b/core/assets/sounds/bang2.mp3
--- a/core/assets/sounds/bang2.ogg
+++ b/core/assets/sounds/bang2.ogg
--- a/core/assets/sounds/bigshot.mp3
+++ b/core/assets/sounds/bigshot.mp3
--- a/core/assets/sounds/bigshot.ogg
+++ b/core/assets/sounds/bigshot.ogg
--- a/core/assets/sounds/blast.mp3
+++ b/core/assets/sounds/blast.mp3
--- a/core/assets/sounds/blast.ogg
+++ b/core/assets/sounds/blast.ogg
--- a/core/assets/sounds/bloop.mp3
+++ b/core/assets/sounds/bloop.mp3
--- a/core/assets/sounds/bloop.ogg
+++ b/core/assets/sounds/bloop.ogg
--- a/core/assets/sounds/break.mp3
+++ b/core/assets/sounds/break.mp3
--- a/core/assets/sounds/break.ogg
+++ b/core/assets/sounds/break.ogg
--- a/core/assets/sounds/corexplode.mp3
+++ b/core/assets/sounds/corexplode.mp3
--- a/core/assets/sounds/corexplode.ogg
+++ b/core/assets/sounds/corexplode.ogg
--- a/core/assets/sounds/die.mp3
+++ b/core/assets/sounds/die.mp3
--- a/core/assets/sounds/die.ogg
+++ b/core/assets/sounds/die.ogg
--- a/core/assets/sounds/enemyshoot.mp3
+++ b/core/assets/sounds/enemyshoot.mp3
--- a/core/assets/sounds/enemyshoot.ogg
+++ b/core/assets/sounds/enemyshoot.ogg
--- a/core/assets/sounds/explosion.mp3
+++ b/core/assets/sounds/explosion.mp3
--- a/core/assets/sounds/explosion.ogg
+++ b/core/assets/sounds/explosion.ogg
--- a/core/assets/sounds/flame.mp3
+++ b/core/assets/sounds/flame.mp3
--- a/core/assets/sounds/flame.ogg
+++ b/core/assets/sounds/flame.ogg
--- a/core/assets/sounds/flame2.mp3
+++ b/core/assets/sounds/flame2.mp3
--- a/core/assets/sounds/flame2.ogg
+++ b/core/assets/sounds/flame2.ogg
--- a/core/assets/sounds/laser.mp3
+++ b/core/assets/sounds/laser.mp3
--- a/core/assets/sounds/laser.ogg
+++ b/core/assets/sounds/laser.ogg
--- a/core/assets/sounds/lasershot.mp3
+++ b/core/assets/sounds/lasershot.mp3
--- a/core/assets/sounds/lasershot.ogg
+++ b/core/assets/sounds/lasershot.ogg
--- a/core/assets/sounds/missile.mp3
+++ b/core/assets/sounds/missile.mp3
--- a/core/assets/sounds/missile.ogg
+++ b/core/assets/sounds/missile.ogg
--- a/core/assets/sounds/ping.mp3
+++ b/core/assets/sounds/ping.mp3
--- a/core/assets/sounds/ping.ogg
+++ b/core/assets/sounds/ping.ogg
--- a/core/assets/sounds/place.mp3
+++ b/core/assets/sounds/place.mp3
--- a/core/assets/sounds/place.ogg
+++ b/core/assets/sounds/place.ogg
--- a/core/assets/sounds/purchase.mp3
+++ b/core/assets/sounds/purchase.mp3
--- a/core/assets/sounds/purchase.ogg
+++ b/core/assets/sounds/purchase.ogg
--- a/core/assets/sounds/railgun.mp3
+++ b/core/assets/sounds/railgun.mp3
--- a/core/assets/sounds/railgun.ogg
+++ b/core/assets/sounds/railgun.ogg
--- a/core/assets/sounds/resonate.mp3
+++ b/core/assets/sounds/resonate.mp3
--- a/core/assets/sounds/resonate.ogg
+++ b/core/assets/sounds/resonate.ogg
--- a/core/assets/sounds/respawn.mp3
+++ b/core/assets/sounds/respawn.mp3
--- a/core/assets/sounds/respawn.ogg
+++ b/core/assets/sounds/respawn.ogg
--- a/core/assets/sounds/shoot.mp3
+++ b/core/assets/sounds/shoot.mp3
--- a/core/assets/sounds/shoot.ogg
+++ b/core/assets/sounds/shoot.ogg
--- a/core/assets/sounds/shoot_old.mp3
+++ b/core/assets/sounds/shoot_old.mp3
--- a/core/assets/sounds/shoot_old.ogg
+++ b/core/assets/sounds/shoot_old.ogg
--- a/core/assets/sounds/spawn.mp3
+++ b/core/assets/sounds/spawn.mp3
--- a/core/assets/sounds/spawn.ogg
+++ b/core/assets/sounds/spawn.ogg
--- a/core/assets/sounds/tesla.mp3
+++ b/core/assets/sounds/tesla.mp3
--- a/core/assets/sounds/tesla.ogg
+++ b/core/assets/sounds/tesla.ogg
--- a/core/assets/sounds/waveend.mp3
+++ b/core/assets/sounds/waveend.mp3
--- a/core/assets/sounds/waveend.ogg
+++ b/core/assets/sounds/waveend.ogg
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -95,14 +95,14 @@ public class Control extends Module{
 			item.init();
 		}

-		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.load("shoot.mp3", "place.mp3", "explosion.mp3", "enemyshoot.mp3",
+				"corexplode.mp3", "break.mp3", "spawn.mp3", "flame.mp3", "die.mp3",
+				"respawn.mp3", "purchase.mp3", "flame2.mp3", "bigshot.mp3", "laser.mp3", "lasershot.mp3",
+				"ping.mp3", "tesla.mp3", "waveend.mp3", "railgun.mp3", "blast.mp3", "bang2.mp3");

 		Sounds.setFalloff(9000f);

-		Musics.load("1.ogg", "2.ogg", "3.ogg", "4.ogg");
+		Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3");

        DefaultKeybinds.load();

--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -56,7 +56,9 @@ task run(dependsOn: classes, type: JavaExec) {
    classpath = sourceSets.main.runtimeClasspath
    standardInput = System.in
    workingDir = project.assetsDir
-    jvmArgs "-XstartOnFirstThread"
+    if(System.getProperty("os.name").toLowerCase().contains("mac")){
+        jvmArgs "-XstartOnFirstThread"
+    }
    ignoreExitValue = true
    if (project.hasProperty("appArgs")) {
        args Eval.me(appArgs)