From e9270efbc6361816ad9a7dec5660a25dd5970a32 Mon Sep 17 00:00:00 2001 From: Allexit Date: Mon, 18 May 2015 04:53:43 +0300 Subject: [PATCH] Updated GameName, added icon and removed useless logs --- core/assets/sprites/Icon_128.png | Bin 0 -> 2252 bytes core/assets/sprites/icon_16.png | Bin 0 -> 652 bytes core/assets/sprites/icon_32.png | Bin 0 -> 725 bytes .../gladiator/listeners/ai/BerserkerAI.java | 2 -- .../gladiator/listeners/ai/RelentlessAI.java | 2 -- .../src/com/saltosion/gladiator/util/Global.java | 2 -- core/src/com/saltosion/gladiator/util/Name.java | 4 ++-- .../gladiator/desktop/DesktopLauncher.java | 4 ++++ 8 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 core/assets/sprites/Icon_128.png create mode 100644 core/assets/sprites/icon_16.png create mode 100644 core/assets/sprites/icon_32.png diff --git a/core/assets/sprites/Icon_128.png b/core/assets/sprites/Icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..c0d5bfd104a9664e9217087e0eef70c48b8e5900 GIT binary patch literal 2252 zcmYk83sjQX7RNt_6knKTj*5zDx5s2tkP@aSSt^pxmCZ^+ltjg%#H%R~`6x@xP^arO z+C!YCy7o{TWlBv^DZ}OlQu%-!1yhqLRK^$J`+nV}>$bjizO&X@Yw!O)d;j)c=WqA-j+4naM zXwDJT=_VzYowP?Uy(a6)3VlIXXg4}rSGR{E?dh>))9Dh~ zA93$w(Dev6P06;<4NfOdp5%DByC;r?SBB^-S{oZrjPa-vxMz9DpXyc~Wo%%8L~-;? z7s-Z)hlNQrnyaR(GPIBs7DgU>_;3dWcXsBLEHE%o(5h62A3hvA26~n$R5@xf?(QZh zdEy9=0!(f#;VcOj)iGmvvDoq1*)$3UgRyJcfI4;V)K1-;m6esiCKx6t(+#~eq2MwX zWwP?}a)GikH-boXO=q*4YV&e)IT^aYk5i<*z3`^rfA5yLxVZShk|+8b2erfMx4LBp zK@1!)+cW|U{on@JF3(xsF?#sukyz#D=O@gZn~F~!5T{Lj>Z;5^WwBWMEauM%_ty+R z_)eo0O9?-fmfEq8A9pIl2i!X>C=)4iSQbSXG&+84XlQ6q`+@nr<5F3-Dd-$jsJpEf z@L4JeGC$2v7BqWfJWh_)doMcau7AR{x(%PE)1gu^TAf)kgH^P*`zAX`%2XNh#>Pf6 z_x8xRi(vBUa!Z}#e~4i`x2TpIYfhujKM#TqdSunL;u?~QYa1F8DcF<+&SexAmxbWW zi99)enyrRtW7U=}<_s#B}|WC)eIG*Q}p{*78`D&ZgVk&dyF? zW0#{ErAE}3%+0Z+x~il3J=X0uFXaRZf&} zyeSvL1k39$d3~b;0yUFig*@t7aM6jtgm${hF7+cSqEwRh81uM|Z#*4OuN?LL(Kg-0!B40Ot$ao%!1$eZSnPZ>RgazJ9(l4xw{SStJW&#GUT>D1uR7?bj|#X$mx#x{A<^&q|9!h`v?~E z6;Vix_*ojg&_T)GLTF}uw$(+J`9$zvEnkwI0$kk<&(?nPv$HU|HC>EGsAgCU z(AmQ66lI z=`^|nP9aH!$`J%nU|b*L>)RK?rPZ89RK!7dS69lIjKsf)POCDCB9UOD`mr0WtZZ*G zmYFnN8I&CD+?8pxN_)Es1fqJ{454lWdM8~C&Psbk;m8En(W#xWoJ*JVDZEwy?Qg1a z8H~PC-*VuqY!`3poviFSQGx$<<2vb*$fSMny`N^>Gi$lI_I>zve>$E1_gtBEzJ-b= zQz#z)pZWap3N{!<6E#R9w{AfmW2l32V`nVgac@j@XCAxAFDqVgwrK z7@lU)bj*b#!@Dh*s%-&dxCA&m?cRy zkB0fe1kD$;-jKDak4tvkTe0{tJltJ^z*<^b3KQr=VT9(*2WC|lHE877^|a}3QxOrV z^+qDi?TaO$g>QR$;!llEJvhOv$-Ys*=UlfY7ytT@(GqfUwKpFhgaoZ<<}$aB)=iXa zXKJ?=p^91Gj9SR9l);F N1iuj9ngiqu{{^ZlGm`)S literal 0 HcmV?d00001 diff --git a/core/assets/sprites/icon_16.png b/core/assets/sprites/icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..47c8aa210ccc73d26b53914d43f0760c4e076d4f GIT binary patch literal 652 zcmV;70(1R|P)VGd000McNliru-vtr@FgJU3?ezcv0vSm} zK~y-)ZIV5U8c`I6pQ|&oIwGsL@dH;FWOQb9Mn`2d#l{PRx!pZ*9?tumBLIGXdU3qFyW?;;u-om(=kwUMjpun> zU0vaM9;RthE|pG6($lC4gEdUo67pFGl1d5^%h9LmiY!-kZ2sj)L0Aw;5 zCX)#OrBdk}FdmP&zP<*KP3d%+&1M6Ds;Y8=!C)W(GJ>w_GJ>K!lzrbP2m%1M+pVk@ z3Wak3!0~tlV6|GwD4M1LFq_R}#QlDM4k(pM65#tj0Gg&TolXI$R;w~vB9S2#Xma0np9WilB#wx(%}MkDF#zY{c@%?Kcu%VC

VGd000McNliru-vtr@F%L>?WGVmv0%A!- zK~z}7)t9|%Q&AYke>Y8=5YpzW6q3e53?(!}h0KDxIJh{82rhz)=>H)OE>0qXi{Mi1 z?q851M3Tjlh6F>tnlv9xlP1@peKqglcJ}7k&civEd!F;W&v}oi{H^Nwuy}C;*VnX4Q8*{AXAu@%!5=8(?K+ z1%Q*269Bfix79q^!N$f00Nrkv#dU(cy*&Ubl?ni}*$jZ&kKS9ZP{3;vXJ=;sG@DHT z?!G**7L|!VcxwUt{PffYNF)*f+ p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.DOWN, true); } } diff --git a/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java b/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java index e0ef52a..f47e68e 100644 --- a/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java +++ b/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java @@ -66,10 +66,8 @@ public class RelentlessAI implements AIListener { c0.inputs.put(Direction.LEFT, true); } if (p0.getPosition().y < p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.UP, true); } else if (p0.getPosition().y > p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.DOWN, true); } } diff --git a/core/src/com/saltosion/gladiator/util/Global.java b/core/src/com/saltosion/gladiator/util/Global.java index c0a57f6..5726398 100644 --- a/core/src/com/saltosion/gladiator/util/Global.java +++ b/core/src/com/saltosion/gladiator/util/Global.java @@ -22,8 +22,6 @@ public class Global { public static final String STATICPLAYER = "STATICPLAYER"; public static final String PLAYERIMG = "PLAYERIMG"; - public static final String GAME_NAME = "Gladiator Brawl"; - public static final float SPRITE_SCALE = 1 / 16f; public static final int FLAG_ALIVE = 1; diff --git a/core/src/com/saltosion/gladiator/util/Name.java b/core/src/com/saltosion/gladiator/util/Name.java index 38d2990..f1fe422 100644 --- a/core/src/com/saltosion/gladiator/util/Name.java +++ b/core/src/com/saltosion/gladiator/util/Name.java @@ -19,8 +19,7 @@ package com.saltosion.gladiator.util; public class Name { - public static final String GAME_NAME = "Gladiator Brawl"; - public static final String DEBUG = "DEBUG"; + public static final String GAME_NAME = "Simply Gladiators"; public static final String SPLASH_SALTOSION = "SPLASH_SALTOSION"; public static final String SPLASH_LIBGDX = "SPLASH_LIBGDX"; @@ -52,6 +51,7 @@ public class Name { public static final String SWING_UP = "SWING_UP"; public static final String SWING_DOWN = "SWING_DOWN"; public static final String SKIP_INTRO = "SKIP_INTRO"; + public static final String DEBUG = "DEBUG"; public static final String MUSIC_THEME = "MUSIC_THEME"; public static final String MUSIC_BATTLE = "MUSIC_BATTLE"; diff --git a/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java b/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java index f8f7e08..3b35b3e 100644 --- a/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java +++ b/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java @@ -1,5 +1,6 @@ package com.saltosion.gladiator.desktop; +import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.saltosion.gladiator.GladiatorBrawler; @@ -14,6 +15,9 @@ public class DesktopLauncher { config.height = 720; config.vSyncEnabled = true; // Change this to false for performance testing config.foregroundFPS = 0; + config.addIcon("sprites/icon_16.png", Files.FileType.Internal); + config.addIcon("sprites/icon_32.png", Files.FileType.Internal); + config.addIcon("sprites/icon_128.png", Files.FileType.Internal); LwjglApplication app = new LwjglApplication(new GladiatorBrawler(), config); } }