From 0f31eb7d23963d6dae8c2bf019f4b282d069bd5a Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 6 Nov 2020 18:09:08 -0500 Subject: [PATCH] Changed arc sound backend --- .gitignore | 1 + core/assets/sounds/pew.ogg | Bin 5621 -> 12352 bytes .../world/blocks/ConstructBlock.java | 2 +- gradle.properties | 2 +- ios/robovm.xml | 3 +-- 5 files changed, 4 insertions(+), 4 deletions(-) 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 0c1df7f711cbf6e2481a5e5af301f188cba9f2ee..d4b1c791c6c15c68c1f2834fbaf0b78db9bc860f 100644 GIT binary patch delta 9176 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 delta 2371 zcmV-J3B2~eVD&31PiJRS00IC200000005LVyc_@k000|?om>GP0d{Y4Vrg>#00001 zM68i29uAZ>yc_`l000)uGkgwrkya%;1poj53IG5AK~hvnQ&c_gyT1tl002};R7^!Z z@4LSV0000%OhQ#nJ@31}3jhEBM@3FjMLj}nb!Bt0s!JPce6cxP~&+N|EJMiUR^7Hdwaegg0)I1rLR(M%ICztF@01QRsD7ZShsc-G4%vR zWLb^y|M&0TzYXT*9^r5_ho7oo0szp?ka6bl61)G^(is52Jt_dce`WK3IC}IbJ_G>% zjvJGr008zbyipz1CJBH&760x?43nY&>_X)+oc4WI9dx7M)+h!8y$HxG{1T<5OTRvlKNrW!@6@HkOeJw_0P4 zK0{Z-JPd?NRAC)QFN4PbxIt6^0Pj2jAqJ0v+ z^f>>2IoCM;FVA@5sqg=P`=~en`L9PKbI;}F<>lq&`Xp({Qna?$+saxG6P(14bgMxa zybjNIz4smiOp2;rv2tZmT>t>!KH_Hnl0SOhzt^g>+72>T`^x8kH+596MMwGG#YqOY z)zz1Z3c9lJRV|v;CBhkILQ}q#uzZ?gAnX_8dmdZflfwwc@sRNDEWg?Jgjb~7I;j?s zJ7E$3RREU5gteq}wcn`V;ZIiqUP{(qt7FiP`N{IUcm%f@^T+E701%+-c@iM^R7zq& zPg|Z-zEYg>vFyJ$VRYd& z=P()Rvbm382 zXUQlDiorTh0Ki*%moI*Y;xQ^WHD^k*lB?k4%CnvBF#s^@_F%tMt2A(Qp!`G1)@=UC zss^v~#pSktmW}6jwL0*eMtyUWd~K}v;Pr7OtEZPWD-net3e^|sg!dU~Agx=cwD6xy zP>He(BDG5slm47~I}(O#Wx{fSPOl5_{oY2*#kFSFY&^O>4?5-3mVQc_D-5W&Dl60` zR}E8^Ft8N`HtZX>_ob4w7eUz`#V*yl1SIsMM^}Ejv%L|( zdwj@Y{{4e*@jv~iPX(>Bx=vJy>!w?I=~*_{k7~`I+;H4g%`G7Z>aTiu|KEM?^UW%o zS67dJMD6gEeUbIW(ygSQ!^_ekgxpj0(Y2!Ar!{w|{H_LqG#LjM~-v>@9&G7RQCtN;MNZzcgi zDaJ%eiVVt506^j+=F=&E z7y4hA=1y}vMb@PylHz5!>dpoPz_iQBtef+YUT2TesHrDQ=RLFlp2@}f>4y%*{KzKn z2KhyV$glzcOeO&JhO9HHmL!370szqt26X_!@<+>ZdQ;k1r~s|ozCWM_fO@}tQ&%Gp za;8~XiMO+qa@5@w8{~V*t9$j{1-(ZS?&O==!lgdb*o>{Egw~Rf-17l` zXky8Q@BF6dbFmswiFtRHhCkAT3T%6_Xf73#pXul4NNiX0_V)?%mSK0FU;;jWX`R{p zJ%&T2TDTB?@iVe?qZI%EAUi>(j3h|{>jL0fN`T(aXT}g9*8pIGt=v@CTXT6h^y|jH zxgM6?%4t_2tVl_0eKjT>`$coB=_3lC$~xBxOZ`>x;%(}4^>@1DkB=_VT>9}<3w^Rq z)m70vXx!JSsd&v#C-2zV8zjmp6^&#o))maV^EAzkB@Zy2ws2lfP9}kQ`FTES=5p)+@9)TETJQ3*LIOa^^&tQg z*dHIj66U*edIB_)Zf!w-KWf|p{$+gj{X27IUL>-%-|^UBj4?*CbHL63z0N3!nZW>$ zy8hy$Jzo*(r^!}0GYmmU|7E!f< z%3AZyMqzE(^|z~`y0mM^C11uLeQO^dvzh$<(U#vT6Igy6_D5?n%gOH_&PSj5?zH8y p_L9KTa z - libs/libObjectAL.a libs/libarc.a libs/libarc-freetype.a @@ -48,7 +47,7 @@ OpenGLES QuartzCore CoreGraphics - OpenAL + CoreAudio AudioToolbox AVFoundation