From fb0d6f9d086bb131a4770f2eefb4b4bfea127d26 Mon Sep 17 00:00:00 2001 From: "Chris@DESKTOP-4T2L6FG" Date: Wed, 28 Jun 2017 17:15:33 +0200 Subject: [PATCH] migration to new JMonkey Engine --- .../assets/Gui/Scrolling/Scrolling.gui.xml | 7 +- ShootingStars/assets/Gui/Scrolling/thumb.png | Bin 0 -> 194 bytes .../assets/Gui/Scrolling/thumbHover.png | Bin 0 -> 194 bytes ShootingStars/assets/Gui/Table/Table.gui.xml | 154 ++++++++++ ShootingStars/assets/Gui/Window/panel_x.png | Bin 3171 -> 3028 bytes .../assets/Gui/Window/panel_x_inner.png | Bin 3171 -> 0 bytes ShootingStars/assets/Gui/style_map.gui.xml | 1 + ShootingStars/bulletjme.dll | Bin 0 -> 5015946 bytes ShootingStars/lib/tonegodgui-0.0.2.jar | Bin 0 -> 1063934 bytes .../nbproject/desktop-deployment-impl.xml | 282 ++++++++++++++++++ ShootingStars/nbproject/project.xml | 3 + .../desktop-deployment/linux-x64/package.cfg | 6 + .../desktop-deployment/linux-x64/stub | Bin 0 -> 33725 bytes .../desktop-deployment/linux-x86/package.cfg | 6 + .../desktop-deployment/linux-x86/stub | Bin 0 -> 27131 bytes .../desktop-deployment/macosx-x64/Info.plist | 55 ++++ .../desktop-deployment/macosx-x64/icon.icns | Bin 0 -> 371867 bytes .../desktop-deployment/macosx-x64/stub | Bin 0 -> 19124 bytes .../desktop-deployment/windows-x64/icon.ico | Bin 0 -> 10134 bytes .../windows-x64/package.cfg | 7 + .../desktop-deployment/windows-x64/stub.exe | Bin 0 -> 30720 bytes .../desktop-deployment/windows-x86/icon.ico | Bin 0 -> 10134 bytes .../windows-x86/package.cfg | 7 + .../desktop-deployment/windows-x86/stub.exe | Bin 0 -> 26112 bytes .../shootingstars/data/AudioDataManager.java | 13 +- .../org/wyrez/shootingstars/game/Ground.java | 2 +- .../shootingstars/gui/BackgroundedGui.java | 2 - .../shootingstars/gui/FileMetaInfoGUI.java | 9 +- .../org/wyrez/shootingstars/gui/GameGUI.java | 58 ++-- .../src/org/wyrez/shootingstars/gui/Gui.java | 4 +- .../wyrez/shootingstars/gui/HighscoreGUI.java | 160 +++++----- .../wyrez/shootingstars/gui/LoadingGui.java | 14 +- .../org/wyrez/shootingstars/gui/MenuGUI.java | 13 +- .../wyrez/shootingstars/gui/OptionsGUI.java | 38 ++- .../shootingstars/gui/SelectTrackGUI.java | 9 +- .../shootingstars/gui/YTDownloadGUI.java | 9 +- .../gui/controls/ButtonBase.java | 4 - .../gui/controls/IndicatorBase.java | 4 +- .../gui/manager/HighscoreManager.java | 40 +-- .../gui/manager/ScoreComparator.java | 6 +- .../model/{Score.java => ClassicScore.java} | 4 +- .../shootingstars/gui/model/GameMode.java | 12 + .../shootingstars/io/SQLiteConnector.java | 68 ++++- .../states/FileMetaInfoState.java | 3 + .../wyrez/shootingstars/states/GameState.java | 11 +- .../shootingstars/states/HighscoreState.java | 2 + .../shootingstars/states/LoadingState.java | 1 + .../wyrez/shootingstars/states/MenuState.java | 9 + .../shootingstars/states/OptionsState.java | 9 +- .../states/SelectTrackState.java | 5 + .../shootingstars/states/YTDownloadState.java | 4 + .../states/util/OptionSettings.java | 9 + 52 files changed, 868 insertions(+), 182 deletions(-) create mode 100644 ShootingStars/assets/Gui/Scrolling/thumb.png create mode 100644 ShootingStars/assets/Gui/Scrolling/thumbHover.png create mode 100644 ShootingStars/assets/Gui/Table/Table.gui.xml delete mode 100644 ShootingStars/assets/Gui/Window/panel_x_inner.png create mode 100644 ShootingStars/bulletjme.dll create mode 100644 ShootingStars/lib/tonegodgui-0.0.2.jar create mode 100644 ShootingStars/nbproject/desktop-deployment-impl.xml create mode 100644 ShootingStars/resources/desktop-deployment/linux-x64/package.cfg create mode 100644 ShootingStars/resources/desktop-deployment/linux-x64/stub create mode 100644 ShootingStars/resources/desktop-deployment/linux-x86/package.cfg create mode 100644 ShootingStars/resources/desktop-deployment/linux-x86/stub create mode 100644 ShootingStars/resources/desktop-deployment/macosx-x64/Info.plist create mode 100644 ShootingStars/resources/desktop-deployment/macosx-x64/icon.icns create mode 100644 ShootingStars/resources/desktop-deployment/macosx-x64/stub create mode 100644 ShootingStars/resources/desktop-deployment/windows-x64/icon.ico create mode 100644 ShootingStars/resources/desktop-deployment/windows-x64/package.cfg create mode 100644 ShootingStars/resources/desktop-deployment/windows-x64/stub.exe create mode 100644 ShootingStars/resources/desktop-deployment/windows-x86/icon.ico create mode 100644 ShootingStars/resources/desktop-deployment/windows-x86/package.cfg create mode 100644 ShootingStars/resources/desktop-deployment/windows-x86/stub.exe rename ShootingStars/src/org/wyrez/shootingstars/gui/model/{Score.java => ClassicScore.java} (88%) create mode 100644 ShootingStars/src/org/wyrez/shootingstars/gui/model/GameMode.java diff --git a/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml b/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml index e8791cf..cca4ba5 100644 --- a/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml +++ b/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml @@ -28,7 +28,7 @@ - + @@ -62,11 +62,12 @@ + - - + + diff --git a/ShootingStars/assets/Gui/Scrolling/thumb.png b/ShootingStars/assets/Gui/Scrolling/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..17753305530be12a2cd19b5e64d3796bff78e7d4 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^nm{bZ!3HE_eYW-iDYhhUcNZWH1V5d3*8?fe0*}aI z1_o|n5N2eUHAey{$X?><>&kwQnUh;d_@f}#E})RVr;B5V$MNKpgoFeEaly(%1|A1b zo9Cy@kZ5B_a4i1%?BFAVLP5cJiE59QCo7cQWi4Nw2z2kWD!MXpai2^nSjcnhG|Qsw e3KJDi7KXnEIQGmv@iYo(G=rzBpUXO@geCwNayUr< literal 0 HcmV?d00001 diff --git a/ShootingStars/assets/Gui/Scrolling/thumbHover.png b/ShootingStars/assets/Gui/Scrolling/thumbHover.png new file mode 100644 index 0000000000000000000000000000000000000000..6db2da74b9f041cb0eb36caee4a85c113991fb16 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^nm{bZ!3HE_eYW-iDYhhUcNZWH1V5d3*8?fe0*}aI z1_o|n5N2eUHAey{$X?><>&kwQnUh;d`T7YfF`$sYr;B5V$MNKpgoFf+Zy$b~Gw?Wg zOV-+ArbHV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ShootingStars/assets/Gui/Window/panel_x.png b/ShootingStars/assets/Gui/Window/panel_x.png index 435db20218d50c7031189c897ddc301447660afe..5d813f85c5424faa410136867f8a49e3e8b3cf27 100644 GIT binary patch delta 341 zcmaDXaYcMXJ{Kng2>f*3T|c>kOTM0&lShT^{LT0v1_nkMPZ!6Kid%2*Y+To5Akh%m zHKW0}x&MXo&kmlsYda0C3LhVx*08hu;OE|!31619ZuqlMtK`jZ_jkVpl2@38Wv(rL zoqNsZiL|usvIfRmpW;3q5_wy;U-;CP`)}(Ww#r0#bzbp~y}tM1-o20Aww(T26E$;$6nnzd*PXGU+w=DwE}jl-5B^}cIY1FHEh%USO2e^x9NP{Zkf>c76lIu zaLS;OEPNmlB$A08B!WaXGPCpDd6w<7EAsk_)Z><`9vo;C-eKQ-`fRAx7W=oHzBiLP z3?=k-Ex1z<_&7&=nryoD(cpb=7@jVzxNr7)&z5(~N}BJQ?+={E6O-+FsyxIH6n>tr KelF{r5}E+9#+yq3 delta 485 zcmca2{#ar|J{RYI1|VFpclqSW6i>=3lrk_duJ&|s45_&F_RhwUS)FqpFFW+FK3nF|@28VyD27WWPto4KuGp^N z{co?-X=|gtzgp|87nHQ-xX^}KS95{dmMPWK zE?o$E8|&rb9oRgjt89yyrsP`>-=g=wPksMq?7rp3tyhz*&xSr;T|6(>h*5W47!aoc zaT%j7pT9`ue_inc7K;ZB%zX^(G6e@1-5Z$s>VbUa1B^gESccDn2_(ZV!^j7hI3Nhr zqG!M3!cQ5?wDS&0^COIAU3cH=Vl#i1>eW^+r(my@x5_W|UbFiBf5Wc@k@`Qo%axz| zb=&nl=@1W|yytamk&|@^!#T$H9=xC8^=s0$sBDi(KjOVHz3^=4F8@Dgn$8I7r(Jn$ zbWU>S^=+YtE!ZBnuCouG_StZ1(ww#Ba~|hRU!L@+uef28eq83}bK767+b(vY_IK|m YUY9FJG>(0I%E|x)p00i_>zopr08Z`Vy8r+H diff --git a/ShootingStars/assets/Gui/Window/panel_x_inner.png b/ShootingStars/assets/Gui/Window/panel_x_inner.png deleted file mode 100644 index 435db20218d50c7031189c897ddc301447660afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3171 zcmV-p44m_cP)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^f03?e80GwgK$00FB>L_t(|+U?x2Zi6ro#&L5(vQU)`|SwAk9}k~_^+LOXN-&H?X84f0aMpI(0%)j@(o1P#3;t`