diff --git a/.gitignore b/.gitignore index b199017043..09bdd6ec4b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ steam_appid.txt /annotations/src/main/resources/META-INF/services /core/assets/version.properties /core/assets/locales +/core/assets/cache/ /ios/src/mindustry/gen/ /core/src/mindustry/gen/ ios/robovm.properties diff --git a/core/assets/sounds/pew.ogg b/core/assets/sounds/pew.ogg index 0c1df7f711..d4b1c791c6 100644 Binary files a/core/assets/sounds/pew.ogg and b/core/assets/sounds/pew.ogg differ diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index cefdfa6887..166063f828 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -88,6 +88,7 @@ public class ConstructBlock extends Block{ } Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); + if(shouldPlay()) Sounds.place.at(tile, calcPitch(true)); } static boolean shouldPlay(){ @@ -121,7 +122,6 @@ public class ConstructBlock extends Block{ } Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config)); - if(shouldPlay()) Sounds.place.at(tile, calcPitch(true)); } @Override diff --git a/gradle.properties b/gradle.properties index 0b7ade7752..cd20e76ae5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=3bd087c3dac6e220c31e0d33067557af5f382d05 +archash= diff --git a/ios/robovm.xml b/ios/robovm.xml index 29869ea7ef..e792b258a8 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -39,7 +39,6 @@ z - libs/libObjectAL.a libs/libarc.a libs/libarc-freetype.a @@ -48,7 +47,7 @@ OpenGLES QuartzCore CoreGraphics - OpenAL + CoreAudio AudioToolbox AVFoundation