From 16d45757e56b5c748ce32f79f8a3b772b4bcd967 Mon Sep 17 00:00:00 2001 From: Recrown Date: Sun, 4 Jun 2017 17:44:02 -0500 Subject: [PATCH] updated flake texture fixed collision issue, and minor value changes --- android/assets/1280x720/flake.png | Bin 342 -> 248 bytes android/assets/1280x800/flake.png | Bin 395 -> 317 bytes android/assets/1366x768/flake.png | Bin 373 -> 294 bytes android/assets/1920x1080/flake.png | Bin 577 -> 487 bytes android/assets/1920x1200/flake.png | Bin 658 -> 503 bytes android/assets/2560x1440/flake.png | Bin 696 -> 608 bytes android/assets/3840x2160/flake.png | Bin 993 -> 1081 bytes android/assets/800x480/flake.png | Bin 211 -> 167 bytes .../polyjet/entity/EntityController.java | 1 - .../polyjet/entity/ally/PolyJetEntity.java | 1 + .../zero1hd/polyjet/entity/enemies/Shard.java | 2 +- .../polyjet/ui/windows/SpawnerWindow.java | 4 ++-- 12 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/assets/1280x720/flake.png b/android/assets/1280x720/flake.png index cf099e039c56be776ffe245ce83ebc0ed4890af0..d73c49677fffc28c12ab530271ba89c35015c65d 100755 GIT binary patch delta 221 zcmV<303!d^0{8)tBYyzDNkleUTE>erPkS2h#tM^BKAAdP)}eYZfuy}iA+L42TiBM^Im z)S*NNC{#fq1M(xtsURCcQb_ohj*iZ4p!{o~vVTB)0Ek174OWo=1rErMAg6+C1PS-_ z^xV08`SNCLBB(H z*dWvxSabsKlA1VS(l)ukYhN$#-Mw1Y$Qp)W0&MxUbQdm9ffHbxkj#J=;G2-Fq?Av5 zH`*j^+wS5xmR;8!v`MO}%3aqj>$<+^wldH2{D$9N2ysKa_|b$yL|&ls?a@J`20xnI5ihkSmm07IR-irl6pL6{o4#UU`WuRAfAmk(54@5aJTaBJ+yDRo07*qoM6N<$g0d=yc>n+a delta 368 zcmV-$0gwK@0*eEXB!5y#L_t(|+MSc_D+Ey##?J>r^1(-BBi36Kip6@_%|@~*r9@)$ zm-w!H!0hZD$)Eao&bfAmW_EYhsi*Fpd+u+}oac;4w|K&UgxD5`LHSoGz@bD)MOxU+ z2YSH>6ARRYykSxzoJkW0wvVt!Se=@(eSm3s#%LPiFvm+5On=*+z^r{*3oEwHsHDKdyN-b0ActG4Ji~>$yyG}m(;fDif0;D9 z?LvSmwVVs0)jHVRrtA<(2z_`24DkhQ%v}cyMJE}Uc9!dJiKf@NL*Q@#(OtUo2{+|*!t^2zu`f(UVv{)^XSeDuqy`u O0000W`dO=A=!N}@^GE^nQ;x{OH9+W0bD~hKt2LzodOvkl?$|OTLE_z zF;%*+q?C1@=QZ-RN`YOPrh^b-K)(O0Gs(a;48z{{{SJ8vM1O$u$ttRyac7Rr&LrEm z{Q$-w2ztKbS<^HXzP$jam&JV0DymJvxHHFQXOb<;8a>bJk|Y^;Hj7#SF|b`uV^T2g z%(2;-WaKyCFrS&fY7ud4b|zWH1xL$91_e|8k>)9=cA;|@XjQCJz3L@CEeL S6*>R_002ovP6b4+LSTYR1b0LL delta 347 zcmV-h0i^z>0`&rrBYy!rNkl6P;HxO= zpZE=Gc6Qc~5AY|;>Yjkg47-aB%?^E3S68n{nRzTphNk?>`k0df=aS=092Tk@Jmy)r z!HKK%BQ`!TwrMesdjg(VuE4r{Vlf7A*k#kUeI4#(fQC(04}YuNGJjwI4u>(o2NOC` zDSJ#t`BzLZ-Z4fxD6vAvrlgvGgB0ko<{}m>!&5D>9A?Pi<)>En3$*tr&TJ*X08^$# zVBA!IH9k(sVy8AhhW*i1wn9*m93JhIRrZEyTQ|qb-$af}`i*>HyhOw?Hh1a0^cnTO z4(%j}Hs?4d^;A~+j2cuuR7{6!8Ir2*t3EW^U2E=R*)&KnXz<3Z5zrMuo~=;bb7!Tk tIlX{_R9XYA?f&fmMlz5%69%gBYy#|NklfMo$pR4w89ev zK^cTYsvn4&pa(W}h^N6L*wrC^2$sOnA>IZHaHd*#V?Li>)PHKVS0ThD>WE75t;u9^ zYumOMjYjvVw^fSo4Tr<$Xf*1(uIr=TS1EqfYPG)bx@Ya{~M6Bj9Z({qsO#@C#JAvS%OPV(-g&Gan@`$KVi{}=XrNn-^acV z$N?L~es?{p{@Fw>^fpbuyc$g#2$>V@9 z$BY|O!RFCpTEP=jG!~1Ad_F&|*X!?t!N4Dn#}8P4g?(L602z?@^A2K;88@ba&7;S( zf}bdi`UaeW1F*AJ?%6zgOe=U|3agA_md&Hbw1OvADMy}UD%d=FOe<91Eq$g!HZP+3 z^6JRAb#+|1Iho^v4slx!NJfWvTuxp>hd3v>vdZ888zwi>FaClUl>h($07*qoM6N<$ Eg0FDiT>t<8 delta 553 zcmV+^0@nTK1HlB4BYy%2Nkl3{s1&wjIW47dO*1pP)E zw!IKTv~_;3^52Wb*)j&*8G4ezt9V1lpO#&K&$J)368Dy9pBh%hBC|i>`!D|gVtWDh z81P*(cm*$MA4y(;08@NlwA+Zx+g8IfOCZFoo!3*h%LEsB$|%Cq)H0r;%d!>+0gCD1 zs++DS^0I)N1Apw(eo;agL$zyoW>dehI$`BPxV+kf=kO!igH)b1+LA3SLp*q5Ya zWl8PO2=n#1Qp^kx1FIBXB^m86P+iRrujByNfptDsOG^8X@bGtI+)ujSv|S4#=h*xl zQNxrP^Sy!{`oB#EKS!_WQyIwo2;MNFB8=5J8Ex!&>G`wj@G|=HNi3GBNY>2pw_3=p rsMG)=*&?xW-c&@AD00000NkvXXu0mjfe2WR? diff --git a/android/assets/1920x1200/flake.png b/android/assets/1920x1200/flake.png index a9b0ba234bf8d08f9ca11238cad8be0adcedc7a0..d2a0729c46f1fe4aa53413e13c283295a18bc3b0 100755 GIT binary patch delta 478 zcmV<40U`d91@{AxBYy$DNkl2R&JZ~xz zd>pC|hr>xGlbJb=LlHwlEhCZ0s@v_ZFusxyxwR~7!EU8edByndATi(*@dgwC zZ@R9(a4MI}jWJ$=4yc17i2o;(vnmgobP z4T^+mN0tg^G82t?K%3G<3^HTDC)(X48jY?sO&go0Ik#36UaQ#2~ATFH4BT zX;ZpL)vlCCkz^jwrgV|y?@3GLL0eM9REbuV6wy>B7bHazs#GK;MOcCw`~L6x0`d&< UT1+&m%K!iX07*qoM6N<$f@dS*d;kCd delta 634 zcmV-=0)_qe1Cj-hBYy%}NkleJ?iuj^JeGrvuAFA7PvaJ?;?0*cO-#6QY&}}xmn>sKgIXP#(nfYcWajqAc!bbN8 zN8J)4_g`cQ8(hG!^LR}?Yk+GiQ&{hsI8Ko3ZjO-zTy+hcGJoKn1z6`|)Z8LAXR2q9 z6V!XWKWJ+n`*=Uf>uEQQt!?{dr%?X#fX6#}I!3)~h67$YpM2xBZfmK=c*ylHynmDJ zZ|Mj38{3OPX0XMK{lXp^+36OTdl~qNLw0bb&SO6vxkJ6cH14uBkEa$*3CMlBDn;U8 z0lPb|?yJ44L63u75C!OB{ZC*9c^gX+Lk-$r@8e z1J3cqErN|#0`Zunoe^_d0jwZDvd#_3S1ZT<25Dp?sDW$6j>>q9kBsW3^-OPlQZw&; z^4UgANyk4T$YndwanR*NlUN++OkfLiHM?Y79O+P5L^7BHqyx4q5aly1hM4(nBQVc_ zQj{aP6m!I8SMrITP1t5tik>xUl!n$frJlWuNwPS|zne>@I~R_=Xc}(vBvnn=7#C^a z_VO38w%i9JRz)H?zh3~FgMIu&L^+NQWE@oKr&UD;t&i~BA}Hdiva||gxYr)~2SOFt Ucq{xSYXATM07*qoM6N<$g8w)y$N&HU diff --git a/android/assets/2560x1440/flake.png b/android/assets/2560x1440/flake.png index 70ce5e2b0ad3303ede0ee1b49b0d58e7dbb87176..c8d79370cd49f8852237cd71fc5f8fc3a1b41015 100755 GIT binary patch delta 583 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 JPDHLkV1kL@v#kIC diff --git a/android/assets/800x480/flake.png b/android/assets/800x480/flake.png index 4e4de995c3284f435e85f4a52f93ef249f6069a8..4d9c7372fa9b2369c3916868ce3357636c7ef6fc 100755 GIT binary patch delta 139 zcmV;60CfM;0jB|wB!6y6L_t(|+O3b#3BVu>L^F(b2c5)%^9ZFQ8L=BVg1rO3ip733 za1fG5?jrK2-n)UUtO`(o;u2KVBjq6+iXGW&@1vIlvHv^+$n7QE>uK)l507*qoL4t delta 183 zcmV;o07(C*0n-7HB!8MoL_t(|+I3G03c^qf3y4<`W#HfWxq%8g^o-lv)Dw8g*mU62 z@fIkhAx%@Di@-T5E|Emw2qo93dBlTP>ld3(&XpWTVa2VJa%(vBdU0lbWlM)&$Fq^s z#HGyL9oh`M;mtuZR?Rz}T);Bro~ut7SlG2)9CW4&JtD_1(skin); listOfEntities.setItems(Entities.values()); @@ -62,7 +62,7 @@ public class SpawnerWindow extends Window { private Vector2 coords = new Vector2(); @Override public void act(float delta) { - if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.SHIFT_LEFT)) { + if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) { coords.set(Gdx.input.getX(), Gdx.input.getY()); stage.screenToStageCoordinates(coords);