From 92344328be01d351de6a8dbc9c341cb20fabcb20 Mon Sep 17 00:00:00 2001 From: "Raybz@Raybz" Date: Fri, 28 Jun 2013 11:39:11 +0200 Subject: [PATCH] workarounded indicator, fixed minor problems --- ShootingStars/assets/Textures/heat_ind.png | Bin 785 -> 0 bytes .../assets/Textures/heat_ind_color.png | Bin 0 -> 12902 bytes .../wyrez/shootingstars/ShootingStars.java | 2 +- .../org/wyrez/shootingstars/gui/GameGUI.java | 20 +++++++++--------- .../wyrez/shootingstars/states/GameState.java | 2 ++ .../states/util/OptionSettings.java | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 ShootingStars/assets/Textures/heat_ind.png create mode 100644 ShootingStars/assets/Textures/heat_ind_color.png diff --git a/ShootingStars/assets/Textures/heat_ind.png b/ShootingStars/assets/Textures/heat_ind.png deleted file mode 100644 index 7d72b58f7a1e5084a14744b48a93e67efbc36ffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4mO}jWo=(6kYY>nc6VX;4}uH!E}sk(;Vkfo zEM{Qf76xHPhFNnYfP(BLp1!W^ciE)btgRnQ{5r_Mz%@!o`#oay(Zb{6|AqFl&rnFr(8*_VQ z#bwn6byii+lw7h`P$}X{SE&55huQ0EKL7l%t2&tl82Y1tv=C^J{=j!2z-nieW?Cjl Nr>Co*%Q~loCIG4$!Ug~U diff --git a/ShootingStars/assets/Textures/heat_ind_color.png b/ShootingStars/assets/Textures/heat_ind_color.png new file mode 100644 index 0000000000000000000000000000000000000000..5226b0f59595166cdab60d1b44f6cfe4bd18dd1a GIT binary patch literal 12902 zcmX9^bySqk*QdL?k(N&B(3Nhaq@}?nmhSE@r9&2JSW4Js=@O(%mRMi`l@4hH@yGXl z&vWLVd*{a7GtYcx?!8I+x@yD(3$`aRdiuC{f}Ux-e*FyO?djy|=7@%-K3b9+U}S`#Nto#g2ri!z!FUtD(bbPOAChCO zVw+F@?l~rjxI_yZ7=v6zxsY95e>ieZpVLISg^bFm8J839xhS2Ak$|V_QVOJ@`{w-o zey73nxb3F%{-|fhoE9y+S~xEcM+-f3oboJ2zIdNJ%fR;tEfSsOT_i7>wuvg-ra1(U z?AydtTq&D3h7A__S@7F#4A8=?c%&}wzp~F}`=L>L`Do-tZ8G!%Tw0kz9W%-K z40!@hbX-oo&tH*GB+1xj5i8ycv{vM=)XH}xj>uHE8Lrr!Q2*}GW>XtZY)T{)?<^J| z-=t_!O&0mczb&=BY(yfCiAJU2MhkkI#4brLn#4-+gMIra8cH4C#tUgGfN~%l&hysL zn%VN9q`>xN&J|i;TrGTc^TVMMgoQDL#?4>w&3VCU{>?%`HxnAo>4TZr_UgQfN{2*y z#}^3+ak0O3`v3ecJT;MPD#7%(oz7&9|5A>d9_AU)-c2UGZ@Wklgb+kd3!;s!-`g!n zqeXtM@nlBy!AW)Gg_AH|!P8p2OiXgg^M=GIXfH|s>Lv7*H}yJmDxPGV&sxd+*0xQK z6oN4F3v%ga#DQ$ol5<6 z9;n>riYYpindW*PJ56yePJ1&vL-7e6T^)lj6Lr9e#YAvGBSJ< zOd55p+DOvYmn_Rz1g}Jw@vkG_>*F%K5_iEKeZ?b z zCs2ynC5t2@X8id}oN(P9xxV;DidAqqca85IvcYMw&Z&gF39%aKZ z`d(&oyHFnCvBh!@as#-^KZ3H(BG0nbIqS$9lcJP`yf|9215*PFq*X(;vf1{tEY;^Y z*<5k=$@ZD{h4#4$w3pcBvMa_g&Plw*?=bGj@6xbT2Gs|(q6J%CfmOk;?bNqBIj!Fq z&TDwLJ3t)be&ByQ%ocwW$ScT8%UiV=T+2|K^M>P%&pef@p=-px(LTjK$Gqw1YKLYq zb1@Gww*riU7%^Ihue^9FCEEa714%=MCqYUhBIBY16&)~*VP6G_zO$pFL*BReZ%z|S zW2L#wm247%g|vckCYo}(j8#1r;4j0j_|D(1xf-?Nb0;SRKl*&w8KeHz{%t)sghwwg zAV)8ElWUXrpFVo!r)sjA%*tk)E%4yvn}auNl?|0DS{cGU)p+~|yg0lNWBHopCh6+W z4L{01K#VGVU%9FlR2|h6f3}2#ss@?If$f?Gjd@LF>d!w2X$63*XZiPgF3pTpjP;Dm z-}f9u9z+**nAe#1nis9U_KTK%tzg|_*`pR_@>*p`k3+9QWv7(eI;Xs#rqi@d&&OKJ zg5MHYZ&JPVp`*AX&mZESa*fH{njSOFP=Zrp0jINy_h>y)TxSe!E{(GWTc>UKg}vQ; zQ&!)n7cq=l#^bT-ie`uE}ecZH8kx!O*XBR5lE*-e=2q&{^(+7n{7Am z;=O6~b#YB%^UK<0fVhHqu36fOpigUO*B#D<&;{+pWu8~=v5o&|wB43-%XjeTc1-0* zuFcl(-m98Jd`opp?_*y%Vu@(dLEzL@JgIba8UUc87IubT5DX{o?1n|NTJtMtIj>mWEl&0gJhP(ubahfO{pPS(3MuXZFvy zMV>WtpJ`;e>RapEh;T`B->RP-lI>>BXWo~~mJiOBihOI{YyQ=I2SS{+p3ULyB>Isf z*s0k&v#bo3Ynp4SYC1o9@ZU5PCw3$XrLtI8_V9&#|M;Dt-q55hJuB7rYjL8=X#6Nk zQrOI;v!uxGcK7!C9VauPhMopzH#L8mkV5-W-W~0)Ya@9hdR)s~N4ojCzUmF?#anPt zeW!4?e9l4kubjU*q+Ai2_eE+)sYvI#mYL<;aq|ltDtGuw3U?`~2|I^OJ3vBCpg;ql88GDB z=tA;mTBDD-X&;L@E40@+=1+VyF(spdB+G{K@`vvI>d>5r)(6v~A*le`=hSWjber2P zm6iJ7OdILe@BYAb$wkSNj;P~bYxNxw0(P`kf|9(D=ixSke4T&N_N6{JmwLz59J*t^VW;#em{IC{ki?q{Z;&lOD`2y7Tnj?A1mfE z5_D@z>tqB&;Fm;O+5-i8&OS5KC0a^SK8jlpfqL3Ae+kKHJ+5%BNh~ir1Mjl$D+$AN z!<>cJtQ7r5evN;tPpvOO2sHU!T3kZ^Is7)fkNo*^)UW=~N~*!rmsE&VUi^oM?_<^B zloqtx!>X%i`x*t>J1fcB%bJrrk~0i2Jn4ny1$k~ge#PCxRUxfpF_C{0x_H)hGUHy6 zTTwk~Ir@hcSE*NNnjzv^>#Oi74?$^WnUQv#wxnKxPD!DES?_P(p9@LO`!h671Q8z} z+pjyPFIdBU9vUMg?fkc~|BX~{YFUr>$zQ%-sW0t}>{M$qv=N@9?a7MpxfR@T-|RXI z$RRX4Z8_yv+6&)%+`ITaP`#*E_K1y{fAIhx-dlLOOXApRsVSrV`|tbIQ=Rif!3U|E z`JkbB!2cWQOB*e;XlT#SG?ZT%1+E^K{7bP!1pTuKIrPJ7>9C)mD$1b9NGclR9s%wo zqE=mggn#mS7O0YlPq%H%NDvkMx$ot?(%BrrxuHhg$8vqkCTP0Bbl4hf|8Ka&VUW!wY-P%*-h!0#+!tjY=Aj_@pIF~Rg=Ziffrkfibegh zXN)Ljex@=ssVK@Ws&w!ky3|o$1kvP5OE=mPwjyrm++#%cp&s*wSGL2BVN1*lM>j4I zSlS?jCBol_N%UTrpX}6vtzORJ`t-Ix{4xsBa2AFGqYQipnA5U4rvRmMn&m8Opp>t` z9j;0?9n(jz4=0_H1n;Fbn^|l3*3pkJS-!BHNJm2rk8om)iQnQE<56}vGKLH3Jb#aH z!$VL7n8fadIVk;+9A3vnl7`YRE5)PeTePyp`x!viKK>NaTmHaNksRcXgQC>&sGj@Y zU6#i$wiKHkf?elLe(I6gJ7cy6EM1SO*iR**D(=jIl(*C(vuVZf zA+6o>4F>Ok3`)re1kN;?vwF61rz}3QA<3Lj+9R$}(4hWf7o+LX8&d@4^m~Xd2I5lW zlGAB}o0Eu{L@9#JAmz;w3jvWmt*Ay)PJhrlm92U#2=8FW*!6>XjYSuhrQ>yLsUKw* z^k`HO_3Vy*<&rHRl~ablJg5J=*|My^NWfRTS2m+m$hrjMo?En>w7>XgT#SP!Gq;aR znX`@P)$Q`y7ziWVu2kMbeVi|kMDc*-uzo{_yb>a38`CICZ(j=7+qlNGZ>4dIP3{;? zpE}#Cy5JFmli$Oz0|j_Ot-dZU^7@wiT6+V1M=+Snxf>aPIqc4SEB9_h@h6wZ)Gp;D zLGmf4aBI&XC%hi- zIc2w_A0ft&LEEQ4n&~iiyI;%U&%G$^3DybD_*Q&;C-Uz)9oHrCkza=0zY(ncX0i>L zBYA^gly9^*?=Z|r4?wiq9;y^|(o(>Ztk$qm7>}JDI`@lzd&3CoUz#4}7UhGtSl?C2 zj^SB+bpP0|bF_LsuDEpkER^`ligIC>W724J^Ji=$k484XfB0K4JSR4@DCa*>Nl_mTXVH>(anDnH!-a(1K0c9Utkw#c5FI4lkp+x%2bcza z%YVGni@MaanGnZ?eo^9j@RVEe&#n|(r=mbY6()JK$(gg;Fv6T=_`zK;;ex?!w3U~5 z+oZeul*{&v{MNKX=%}m{N0u3R$DH8x$-sAfdy#zpJ3rYtvlrVTXi>bmVHr;DadhJ` z4z&0;Q50=sJyv3#CY`Um3Y3njJIaRZ3YHgZ z)UPx@X}4}POCzckldnFz?F}mbe7xBt zVR=@{*(JEZC*H9L^k*vmmR-uBlr{U|jC&n*t0#Joqs{Fy^~|sOUX5vErs3XI6L^ad zx$xfn-Muu?&#vL^YXVqW0fFu=r1L~5p*m#kU3hD(&p!12-9zuQ7m+re`!Wa)lNPkQ z7H}8e@J|UMIi)x&lc?wrMej{op&A{*ak7T+N7X}{<0hd!FMBBQ7pU4H)UAgvn`k^E z-G3jVk*-BRx%|=OHLoEyX=QmpNPj_81o^*Ei}ly@J+HTRIl&#a*vD_&huy^He^B_TU7XZ!Vq7mp9oa`ycKtonSsje`_rTn#{t*O(ow+ zVjiH)ILKeNTCU4hakr*>L~JA@ABlFuKPP=l_=R6gKSnDyd`zwVzQ@DEJ?kM&OLaej z?|sYwgWd9$pjpcySqJ&e9$np9{41aQ;Le!Rrklti9m-B8{9;$EKq32gOYXgb4u>*j zH6^AghbXU{>23`hQu2T8=jC0)Lc|2 zpFvUKvVz|7b;i)vA^#!|?;KA0Wc1jJ*QiOmyB+#%e+c*1Fl;ba_C;LTNNmf5$r0e! z(E+z_NYtrQq9w<;`hhUWNpIe9#&q)&ix%W7d52;Z>pEY|D;rItaXO1(H_}d|Ncmb! zL=tWP9Ng3Ft!LB(Ep%DDatF@>0dF@}{s=jN`S~5cEDw=6ug$`eUNy?9Z|c7rX(ZvN zytWfFC&i90cXlp6=yuxiENJfWT5uTdqx2NCvR8qWV&n;Wh~`C2V%l&uAnmE!>N^K# zVWZpG#5Qv10NRkG`GwmF_4mBqSCp_n$rjd|LiiRvaS(fEtJ2w#4d-S9c2nV~`fAwm z&FDagYBXy z@a_JbCNy9v3y@F6^tYw&%sH6ks5jiHWWcNvUm{m!w*8|AUS7D{1=HR5EGtS|9gS*V zpVr=LMtCs)e4cU(CCwL&x;TyWD>$f!vvT$Y^!!>=CTE8ZyaQpi9gOgJZ??^;e0*4z z9XH5ziw}%{Z4{9#AD_CPbDL**<)&VDCu#8Y-r<`p`=&|0F)cPverX`&W_*i}QNxG_ z^h>3SZ2tjZ!V@RNhfe;p&*ofGyh(QGpq_9Y?WF18Z?@5;UHh4{woU3=qzOF{i55~B zn+-?`+f*g35O_D9$I@^{pw!GRr#WHoz#srR34&ho8acjU(?aTwzO5B>()=;m?b*$~ zt0n8}Hqk~;CVi3M&t%hS(lRoAXcw$`DncGNR^V4wpOuW%1Mx6VFN<^;jhDn+Ai9hd zPM2U)lEXw~o_Ro&+Yb3)W*pwOZ<$C-2Xs>OR1ds#1_`MuzurCytKHF^I{322AG2JcS== zb||FgB(e@=d$ax73Q{(xk;94E6Q5E8Ol`W_H^^~|Y$f(~F@W}f^pHD8^i#~%#mqbi{7vE#V#o;xNk z)98Y^lpi*^4sB;Cb*BN1NC@9#UZ{#GsL5E6b4x!q=7NjnvGE6ECvJe0by89Oi>$+7 z@JDRz?Z(N^Lo{a`YBj4u;GHpF?CE9gyzkvFJApd8k-KN7>oovtQ6M`sx-0Z^^5-Gq zj1)Q7-O~y`Q139H?+4@U3#3LIwWIb3kq<_I(-qp!nbA865<@?)1xjf{n$|r$oe4+~ zaHlljP?YX@?K7v9k-KaX=O8#*0te2()$UJ=&rj{njxp$$*5_=KR==~G{8J+wRnHZweeY@lkCsyt*i*cQ(?4kQN1pI(=E>g>@S`c+jysqW;J1*TxYm z>LVl`G8i|%2zB)8H*^v$v*hBsF2>l#r|KSS@MxhHQT3}mQz5Sn-7k2QpNl#eKWWS% zELQR{uL`;E+n6=NBR|;wQ>uT(HZF)(3Qt)}i;**H30X_%`ea&OOO_K?2f3Mo@_IJb z&5SVfo1(HEc%O{b1s(1{PRRj3b}TagDJLP$3^P)ST+$9clT26EAT)hF-H|{Yz2`u_ z;b9?2O3156`ww{_(DxCYZdJd~C~>(hU#64et89;crjucSDRvJ)dt{_@sV?^;XnC*) zzIE5iR6NnsXt+@q$D?oeDiLgn#CcqWwRSK+V4sA0O^gr}C&gIt@J{qhS#-&dCodHe zh`z|Ouysyp^IaQw13?R@&T6qj!bqmMJc{y<)aXO01FFdcM=9*!Ojj^i>$qw#2`z#i z>fm4*6>mD~44x~O z7uU>=xNmK!T@|>>Nt+T+a{v4gKh}e9P?B=EBlIXZF=FKhgH_Htysqi*99(G4CiM0M z7-@a<^D0A~+%g&k77K$^dF4oMu08N0kj2O%G6NV4vcvCqT>YmhstU-CyZdI`uf9RW z2hDW7=!xC-V>|pO$ScKvWe5Wa4JUcR*y)~3LK(S}LYO6O z9#(8MWU4sAc#yT7^rq0T{WS%cVOlO-;j8bB>GkjT?|fx)V=kWJwAicgQ@W$hm=Iv} zYum)D$>8rBeCL0HC)l?sUF5L3!371_eGjiZHM=71O(6d6`k;USU8Q(IzcFL!#wng& z$a@tb<)5&s#Boi@OAMX2nK6e(bftWq&yAvD;ev%R>GnWPAw2T56pNt}H&}ISTOYm4S23*V zFRI?hc80!Qr%We}Xw;3C9~>Re~^$$x6$CpW?aa6Z8jlbIBvrCsQR{0 zI`7+iGea5y5X7_B+ANSSHc?RfxJ|si6D_niw#|lMQQ!%WH#{NdnVTk5rKJcL3U*D) z)2XHpAnUvpS*in+r6w$$_lx0^|J%B3o7b){-H(OnO*+M&o#|#I7UYtuq3V-(I&H?Ez zIV^pLw%ha!dwQ!dLR{_^kL@4^80Io}0kVJ*hSOSM>=IC?=!zhtfR8$OY`C;vh1&)f zyUE)3u!jCKB7r7OieQz2qfOF={<4uvZ-0&DL3#Unfc8dav<3RYJhp}lvUhkAJ#&|} zvs`Y0J>BQ}dXArtg|J%#ka+7=kP||vxLdXJ7PvUjiFM*VK${!b@RSKk44(I6x(5vG zc5A3|zo0Hi-@*OYg(B=KDZ!72d`%=vBQUrz_2!b~n|iNp>WlOJyLerbD7&(b7Z1ay zTjd!3)ovA(rH)XFN0zVWJ0juO8qx|3DB2P4Z85~fM|5U@x<>`&j422q11rJ^!c(kU ze3}GPX@9gNg*fV&Qsli@uSgOE<9}!HWEYm(9i^@%gg&iwA1DoKexmAgkOF38; zju*X>h|aG$3PH9)btMsVe)AuzwJ|`M-n%?(n@Lt|a|<@*k{WITpLX8~Dj2v^e0G(9 zt#E7mS3N8f>xTW_#uOyjw*VspXJJ6~UnLS~wC-t%J@ledf}ZJL#gR>Y+B26%d@<)w zLM{=o9jH;agEq+8lZ}Z0cm@*IxTcqUIMjCpq86c5sLj(=TcBtunXyVQKq3yZv%FhJ zU=a7DSREBhmPP|>y|Duw`!_y`CIYag+q28Z;;y0Pel>u^{q2M2=cE5kUKr`|3YjB3 zu_6Z0aDf1cstGj!JhmuG03LoZ8Q?!f01Td3G74!n~ua(346_3DfK^ zSKfGYc(UpCr=y%8mD5O{6)$ZJ9%Ub1I9DOCy4M<@EQi8l8pcB-wHGc(g zrL+!&WAj;z>8MS4veIm$d<0=-!na@uc3t0p`=+XJ)L>B<1(6hiVl`CRVR>L39Q;}-(BkQD1dg^OywHtx zNsZx$&;7I>ZP5~nI+W{e*$aY^GL6bI@BkKx0-|kmwke4qU!R5L_4gd#eg%uyvQ}_e z03^`!M0q&|Q15dVeef+2ztfJRg*^yO`KfQdwg3_Xy{7v9HlTc_w_J0m7{Dygx4v2$ z7Xj2XF_@8 zs%PLUeA0AoDC;?W-^0%tOt$YW4&TJpREBh!35V(UI7tP|3r_{Pkz5YYV-T#1pmz`b#9^rQYZh5MzTT$5R`(4ygZODj)Ox>-tosI0 zcM>2`dT7DsBgh}2S)KQlTpA&d`xRo zMOhO({9O2jsg}RWu95qqH8ydn$ExCXOIeVyv1-1A2Sv@zoU4}tcO`VZ+|fuTSH~T+5R^APKJ)o6-P!o@`5_9whRSH zlB@mArCfPS5w5q=r0{k&XcrVfXS0^p-)Kx%1s6EYX0RnN;9XB`5=5K9h#)>HIuAPa zj;;Qis!)Q71z8oj!htwoG9l+*_K3wR02-b|N@DU`$_y(Y-BQ z4JFUv0fXXU;n`;r+NcNH158IG0M)t!%O(a4vw1TT;Z!%wHvYt0-+cFL z_c}d@#&kGPa`8_b>W^cFX`sc=?bt-Ey+1@aY9bdte^XDNQuDNdvLXb?q5P4ap{ML7 zHWh2psRG|R-~`w+KNsREFCxT0T5HNDa& z($E`JrG~8A;n$<`4Pn9V&13UmET=KXGf1kiXt6zfuecqsbea(vwqvAtyaK za?%xJR%&iNXrZo}(5(R`1P&;A0M$IKlW5-ASxU^CfhsH0n$YY`;N{nlC*L-&fu-%D zI(81kIn)qQtS8$uWusqS2S48l30`Wyl6b=W_9Cs6tBfoKrQMw@FW+~TQ5Rf{y&0}P z5<>3v2ZZ#SKC4ybPXI>_?|7lLa~VveE0oF#W~krSl9YcD1-z$mG9CoP14ERzxs^GF zmbO~6_0{~tkqfE2sMK>I3{%x~4-BPe4Gzi>9X!!G{)wfzyTPTT@xiaB1a{k-Cu4Ki z{wK{G2<}+C?;nk|&AyF)L9RJq>?*C;-}2|I<*PtRf5JM{KB$w~IjMNW44`7E;RclL zV&9sWl$6&yKAg7t>?D~+Ayh4k#6ANOH6)zA#Wz~5Rn;0rS>Q~kF|7|f7yP$luS z*2Efjo%zy_x%LYy{VOoog10+h@g)*Ppy53t+43=l5+I?9f`AU;zh7u`tf z;v62k%PUm&_L2+J*Bm94u8uubtrgJ%hGl(_J<#-zWaP`ae6 zoiQF`iGW;hs|V|OMN#|d$dOo|(ymlM?cCSHDOzbLFlQ{uj0&nV**gB}tKKGIsNCpO z!5FRyx4SZL6#qthr*wlc9e7}y27a;5bcP3duC^yBva;lo_DURE2-)6g-8{7V1iijU z*3lzd6a|!)F2d*9SMTFr833XUKwBc?lG`8mR4+lXism%oa(RQ<>?7y{*iO062+l67 z9{U1+PC8L1-dhx%WmFAA&Cs~M)V%QMkSoT~(4(xB{MKi1TvJzsu0aFE9pOcLoWl<^9yHb-jV+=VUN*@1 zn;uSKJoyFY$VHV*2DQCL+k6%>V_y@vVj70+5dd*#%EJ7ZiI-HA5fasuqof423uqL+ zk^Da2UQlZCpUoT05#q^Wq>MKC=M*3R($|S~qY?bDY}c>z@i`r-nAj z9B~*sz1g9Lom*PaWNh0&z+x0n>BoMkEE_dc!{oU(qfM>x&ywJ6D%cTi`%$%twO55$ z132;KMrv__(F(rG#C_eC9fKhUpu2OZU3{c@Ns^N!49cNrnaY+W8@PW2ipb}b+s$-BeL!+jRm|buf2FhQL$i{o&kF+*eCn#6VA(JyBfRPJBa{*-ro#8X9i< zf4uGP>05L3xn`PbVmNu6C|mh+QpCxBnbCLu{YPR% z@Q>Y%tiboWoH4F`8w^~rSfRS~YVZfqV$&~0>AQRrpBQ*NuE?atU)sGVr38#E0mDAT z=6?iT(mlc@6Zx~q*gf=fnD-7AglfatX}5oUa$?+1M*W66SXp$%Lj?7Z@7v^CJpQ5% zxV>wO2=@cwnhtUlNl9N_aC2Vn{RnkV^>I(5fd0X^3{w&E<*>rHx`-330j}+y#x+9Nc|6ODO4DhTUVm%UQbj)#mMr zus0cE^?O70F8X-@k={P0vncT2mxuad(WMR#_kttuj1PV&wPCp#Ny_adqNkEiXMMkt zVVF<9E1?xbZ)sjVzni5X<_vCZxgVvZh+syq){vaB)Kk&voqSwG*rse%8FEUto7-fM zg_Ow3&@^BJ4)6WoYPwTnuj0--+gMq?S8voO1$b^YK`{oQVrEn2HO?Gu_IDA z8f7b~u%H|Ie$}wtsBsiMI<=iy(~cQYC*({$OT$s4~P$hzAcg{4vc;< zCKqZ6`IcN_Ub`u)n;YrucDur|!?WO>@vlZhS!8m7-o7SF@TQ0dw5InXg`V9sfv7$u z2!;N&sG2ccwrNGmIp7zvgr1UFyX9&=U#SG%j)>YM^JFf%Y2uM9m|YGFFX9EQVanE* zzq86FRlK%6$o=Z)#~Y@-uOW^-Gg&EU{_2oSvh0@+&@{=D?LqoPiNBy(GbSMRzk1}W zjX?>LBL^ZBd}`u2kT~i-vWct%z&^2cb;JnAy#!K1=tO~-q!tE;N88ZKxK2;~vd>W& z-3noPQa$dbZP*_7#2_5$QqfO`(!#rhDvCzI)7`IffAg>wlC{Ed?n=6d>|a~iFq~W8 zgbJqQ+B0m;&i2V+Ti#Utg<(86Pce7%bB578RZ&?Dal|M!s#nNi?zAAbo!Y*n+PwQu zQ4xPxP~oTvL*D>D+lBC6CzYG9gFJNNErV9MCErHa)FeUv3WYR>H`|4Go+y1=)kd)l zO1xhoKd2D%I?zyA*w3X8Ys0nqQ{`u?_blVLr3-D#+!5DU9u|AL24#PrPXy-(phaLH z(^j||NWfBjPOO;!)<4z8%dhs6x89)1h}BQrIhmqT$NWSpInCIB4T6;u-oelnshQ(^ z2Ko5mCL(ks)1L<|eru_Q%&>WobB6^&(ub`UYnr*Wl%wm`huM(x9(_Bv3-@6zb9PbIH_=@B3?}ZxW0Tlz)88tqmPlt>pLonpC}*&CF!0#;$%~P5$hXv zQla3_1;Xx>iE9Lpfh3xo3?MofQ2ufY?hp?lYB=Gw2H!A5mFa9ZU)wLY+4YGj^&$&s zmSr)0H!a)VK$F!&iw`vGLoY5F0bAi){stgg08qMTzQXejFVex%=kV~)4YuP-RJ`ga z0%~|Sr!qswQcGp~^Nd+{ju4Y&INXr}CN{K`bGs&@u@@^$)x)E|>{Qj5g(YNN4qR(~ z(M0SIcY5RF+s5x!z6K}^l6-66Z-hacGV9k+aflUqBYW1A|L7WwUN|Lx=KOX3p;$@nqAZNn!9ci_*RTB=7-Wv$zMDM$E zo0_shJJiFyApbu#r1ZgV%fQqW(IZ`?3s*bd`QiN9aQ??Y-G6MOavUb=X;APK(nu>`Q8*sCwfQ znksCMiX>Bw53BZ@5y>k%u{?zF>#IR=j#n>?MQlB3G8JJp<*2uZ5Uan`=s-;3_gB3?2fCu4ydW2E9v&?XPr6ks{82 zp2TsU8?tS3B381!{r-1fJ)n}7ZRLH+Iv6~fB=&hChfH}@w?&3q7NeZP8_;d3?h>1o zt&@k$x9c7%M{WJI30Q9CAz!XVLy~*3e5u1VQOZowh?eOSvMqide~w5Znf{D~$1;L# zX?cD8SOi^GsZ`ld}jJ3)fX? z(S~1N;GA{*MPf=)*%3T7m}z1qV2e0r-}Np=xmW0z3=7@;+i;BC5613$>g+>9(@@b> Jh5+70{|_#&DaHT* literal 0 HcmV?d00001 diff --git a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java index b238b84..0afccc6 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java +++ b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java @@ -60,7 +60,7 @@ public class ShootingStars extends SimpleApplication { public ShootingStars(OptionSettings optionSettings) { super(new StatsAppState(), new DebugKeysAppState()); this.optionSettings = optionSettings; - //Logger.getLogger("").setLevel(Level.SEVERE); + Logger.getLogger("").setLevel(Level.SEVERE); System.setProperty("jna.library.path", "lib/vlc"); } diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java index 14669b4..024a73d 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java +++ b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java @@ -22,12 +22,12 @@ import com.jme3.input.event.MouseButtonEvent; import com.jme3.math.ColorRGBA; import com.jme3.math.Vector2f; import com.jme3.scene.Spatial; -import com.jme3.ui.Picture; import org.wyrez.shootingstars.gui.controls.ButtonBase; import org.wyrez.shootingstars.gui.controls.GuiPlayerPointsControl; import org.wyrez.shootingstars.gui.listener.GameListener; import org.wyrez.shootingstars.helper.ScreenHelper; import tonegod.gui.controls.buttons.Button; +import tonegod.gui.controls.extras.Indicator; import tonegod.gui.controls.lists.Dial; import tonegod.gui.controls.text.Label; import tonegod.gui.controls.windows.Panel; @@ -43,7 +43,7 @@ public class GameGUI extends Panel { private Button btnStart; private Button btnResume; private Button btnMenu; - private Dial indOverheat; + private Indicator indOverheat; private AssetManager assetManager; private Spatial player; private Label lblPoints; @@ -104,17 +104,17 @@ public class GameGUI extends Panel { btnMenu.setTextAlign(BitmapFont.Align.Center); btnMenu.setFontSize(labelFontSize); - indOverheat = new Dial(screen, new Vector2f(0f, 0f)) { + indOverheat = new Indicator(screen, new Vector2f(0f, 0f), Indicator.Orientation.VERTICAL) { @Override - public void onChange(int arg0, Object arg1) { + public void onChange(float arg0, float arg1) { } }; - indOverheat.setGapStartAngle(60); - indOverheat.setGapEndAngle(296); - indOverheat.setDimensions(screenHelper.calcX(50f), screenHelper.calcY(50f)); + indOverheat.setDimensions(screenHelper.calcX(75f), screenHelper.calcY(75f)); indOverheat.centerToParent(); - indOverheat.setDialImageBackground("Textures/crosshair.png"); - indOverheat.setDialImageIndicator("Textures/heat_ind.png"); + indOverheat.setBaseImage("Textures/crosshair.png"); + indOverheat.setIndicatorImage("Textures/heat_ind_color.png"); + indOverheat.setOverlayImage("Textures/empty.png"); + indOverheat.setMaxValue(100f); updateOverhead(0f); lblPoints = new Label(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(275f), screenHelper.calcY(180f))); @@ -174,7 +174,7 @@ public class GameGUI extends Panel { } public void updateOverhead(float percent) { - indOverheat.setSelectedIndex(100*percent); + indOverheat.setCurrentValue(100 * percent); } public void setPoints(String points) { diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java b/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java index 9383650..e4f2661 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java +++ b/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java @@ -115,6 +115,7 @@ public class GameState extends AbstractAppState implements GameListener, ActionL } public void initMediaPlayer() throws Exception { + System.out.println("create"); mediaPlayer = mediaPlayerFactory.newDirectMediaPlayer(settings.getVideoFormat(), settings.getVideoWidth(), settings.getVideoHeight(), settings.getVideoWidth() * settings.getVideoDepth(), cinema); @@ -244,6 +245,7 @@ public class GameState extends AbstractAppState implements GameListener, ActionL } public void finished() { + isFinished = false; highscoreManager.addScore(settings, optionSettings, Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString())); stateManager.setState(State.HIGHSCORE); } diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java b/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java index 744668c..3cb8f65 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java +++ b/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java @@ -59,9 +59,9 @@ public class OptionSettings { settings.setTitle("Shooting Stars"); settings.setSettingsDialogImage(""); setMasterVolume(100); - setMenuVolume(100); + setMenuVolume(50); setSoundVolume(100); - setUsername("Player"); + setUsername("Nagareboshi"); setPostProcessing(true); setParticleDensity(3); setDepthBits(24);