From a4e2aa5381dc40101e177e7b41a72d6a1d63cb0f Mon Sep 17 00:00:00 2001 From: CharlesKim1105 Date: Tue, 24 Jan 2023 10:39:18 -0800 Subject: [PATCH 01/30] Added project pitch and outlines in the Pitch.md file --- .idea/checkstyle-idea.xml | 16 ++++++++++++++++ .idea/misc.xml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/project-team-a.iml | 9 +++++++++ .idea/vcs.xml | 6 ++++++ Pitch.md | 38 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 .idea/checkstyle-idea.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/project-team-a.iml create mode 100644 .idea/vcs.xml create mode 100644 Pitch.md diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..c370431 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + 10.5.0 + JavaOnly + true + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e149238 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..ca0c535 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/project-team-a.iml b/.idea/project-team-a.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/project-team-a.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Pitch.md b/Pitch.md new file mode 100644 index 0000000..c090de1 --- /dev/null +++ b/Pitch.md @@ -0,0 +1,38 @@ +Project pitch + +- small game +- pacman +- shooting plane game +- snake.io +- agar.io +- + +Pitch - A top down interactive space shooter game that player object shoots +bullet towards the enemy to gain score. + +Outline - 1. We will use the processing.org library to incorporate the player and the enemy, and all the other objectives will be conducted via this interface. + +2. We will commit, push, and pull regularly to let the teammates to know the process that is happening and let them know what to do + +3. We will use a database to save data of enemy structure and number of scores. + +4. We will have a collection of enemies and when the enemies are hit by a ‘bullet ’of the player, we will delete the enemy from the collection. We will also keep adding enemies in the collection continuously. + +5. We will try our best to make the project and finish it with the best result. + + +Communication policies - Using discord to communicate and have time set up for meeting in-person. + +Roles and responsibilities - + +Architect: you are in charge of the high-level code structuring and organizing. + +Test maker: you are in charge of test coverage that supports other group members. +UI/UX lead: you design and implement the user interface. + +Backend: you design and implement the data structures. + +Every member of the team will be included in every role and work through it together. + + +Milestone - Estimated until week 15 From 9ee16c6d4cce27811356f311db8ecc69d17afc2a Mon Sep 17 00:00:00 2001 From: Jackson Hu Date: Sat, 25 Mar 2023 13:57:28 -0700 Subject: [PATCH 02/30] added backgournd --- .../executionHistory/executionHistory.bin | Bin 29001 -> 34098 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.5.1/fileHashes/fileHashes.bin | Bin 20397 -> 21397 bytes .gradle/7.5.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.5.1/fileHashes/resourceHashesCache.bin | Bin 19653 -> 20231 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 19343 -> 19397 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .idea/misc.xml | 2 +- .idea/modules/src/project-team-a.src.iml | 4 ++ .../compileJava/previous-compilation-data.bin | Bin 0 -> 4079 bytes images/background.png | Bin 0 -> 3796 bytes .../comp2522/projectteama/Background.java | 15 ++++++ .../bcit/comp2522/projectteama/Button.java | 46 ++++++++++++++++++ .../bcit/comp2522/projectteama/StartMenu.java | 27 ++++++++++ .../bcit/comp2522/projectteama/Window.java | 33 +++++++++++-- 16 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 build/tmp/compileJava/previous-compilation-data.bin create mode 100644 images/background.png create mode 100644 src/main/java/bcit/comp2522/projectteama/Background.java create mode 100644 src/main/java/bcit/comp2522/projectteama/Button.java create mode 100644 src/main/java/bcit/comp2522/projectteama/StartMenu.java diff --git a/.gradle/7.5.1/executionHistory/executionHistory.bin b/.gradle/7.5.1/executionHistory/executionHistory.bin index a012e63f1fb1b1ec2d9f2595f40be1836fd56ee8..dd2b2c7b4d5a012aa04a946168834b992aa439c5 100644 GIT binary patch delta 1537 zcmX^4h;dUF(*zM&CI&F@d@WF( z@f501dY~fX5mcdn0n!*cC4yzqb*>JQhv-yyf-~g-l?>tBtH+Ty*2L7?xGr(=ynOY-=4yAo!r#)KaTUmc zoN#48_Z0~JPW#^bx+jr!+lqg_zgGP`kCqAi4|pZn%Q4q)*!xUX#OanXQYMhso`~=( zEIr=%`fE=gPpZsBwp|Gt2BlTc?(Mwt(V&5KvUjcm>vIqXlxfnjW*UQiOpLuy|3i~^ z#xhNo$*NW%l52L)&)lQ-``yN^mp>Z(<7Di2E=o--DFv1RP?hMJ?GD&3P-c4pW`Q!> zV=xOfvq9Vh%4|=;vY^Zc)(gsP6X0P5v!>=@GVy!>GTh*@G%$NTSzzp{EVnl?WT{H^xlhkCfI?Z9&)(*bReAk2 zedlHsOO0lEpjc@)GpAA9WbZH|ehHtle-nU0Ub3Q7S_%YoV$AzRMYu{@H{Z()K+Tm! fYrXGn_~Lv0+=+?1QdtkV3-%)GMlic*LHjOLpc#+5TOGE7!1kKeo^&PgT8P zo;)EdTWHSI`QQB{?^*TzTDC5uBqEe?`Q*ef>B;A#cqW@jSjCTuJ~Yk4&%H%2DNhiB%c zv;0z z%iOOuF9l;_zJ1=Yt^eOkgMCbl{mwq^s>X90Rq+m03#0rmH+?% literal 17 TcmZQ();^>q^s>X90Rrj(BHsgM diff --git a/.gradle/7.5.1/fileHashes/fileHashes.bin b/.gradle/7.5.1/fileHashes/fileHashes.bin index 351f6c95b5493a15de533dab44562707ab059480..af83385201e4e0f51cbe02716a2cebf9e34db70e 100644 GIT binary patch delta 1209 zcmZ2GpKCPB|ZqO*_3c&Q)$CZ1~3RRpDZhBA+Wt;oq17;=Wd8#;KIqi zk`@{_=58z4uah$iD#-mG3U1B`S6bLoGF_p7D5 zm?v99#QpEXBwY5*{hxd($rvIY;0zOYi*R<`ebTZTA|7lA6L()}vRAWZVH-p|@G?x? zXS=Lf?L!wuCa48#VG{m3tob{eePkixL1!mFl{(>&wyE#KrX#V-pn|huiZdL!FQzPF zu7rxS!o>5wq&cw!hqXh*14<_^mDXZnZQQ8%Lwuvb457`A9&M}&s#!HVHU`z#f2quq z+RDol&%nUgwpZ)ebBHFU&y%0~sxt%mlLh^x6f*ih4n4Ir#H#yylZ*so32+!KSNvptW%u4=G*7jBd2|&^XYZJ@l zpI&NaK!F)x75udz|LK8(RuhO7L0BO7j6uJvZivaRO1mBRg^mY+>=oUiH*K=4kJRL| zKEk{pULQ~?5HJQ!KIp9qbVOf%%;eYJQj-mRf$~6JDny^Iot=L zBV%%-kCcMCdFbr98}Im?-Zn+*@huZius8ei6ClcYFHi3Dff$es5n;VJ`K^ztImi;2 zk%xgYXr9oHWoS8SG{xcR|HBhE*ZV3%O^uoC?;}-TwATCHhA+O?&z+dKOYRcOSEyt* z!~*{Jn8tA|>z!5MQ#IRPZuia1wv+$CI#OKqAUas$Fm*6{T}p~LrOm}woRmi37TN)yxh?&alXvHbJDCIi+|8@(N<5(pUOfdrZ_Z+!i=r;jI9 zW+L0J1Pz1IDzJ{e{4}rz2Bro~9W@Ud9|V*1TnkGgrk0FlnkIn0Se delta 168 zcmbQboN?`Z#tkMCjB1ljB|c2Hl{A>#3dBz(B_@kXc}y;ql9;?yDq*s$w8UgzAg+~8 znA|FJU~;dl5)<>njfy|SHyTukYL L3ly51?{5bHOm{s( diff --git a/.gradle/7.5.1/fileHashes/fileHashes.lock b/.gradle/7.5.1/fileHashes/fileHashes.lock index 09903cd92af13f247054ee72c952739679b4bad8..65b40d6cc144ed6856315d91b914321e14887a0a 100644 GIT binary patch literal 17 VcmZR!d)E`jud-k}0~jz)2LLUk1T+8u literal 17 UcmZR!d)E`jud-k}0|e{`04>S{TL1t6 diff --git a/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 288b3577c3659bf49b8668886fdb0c3417b98712..88c7c98e625302c029f0ce01a9534603a39c99ac 100644 GIT binary patch delta 1015 zcmX>)ld*js;|3E6P2+Y(H`ZqxS@Iabz-RG)DCm&aS2=ZA)(0wnbh4|&34xtCg>gp@ zh2MY(`sPn&l~fQo?D;0)hST+lP{GZUWhFBNZX8%~;`c{052zsLCS2lh*>Zv)yr<^yo=DGgR>E{Gf^t!^De@9bf6N zJWUX4xHe3@IAr67GdDA8pz32Mi%JKmR4xl;^w{!fFH~?LOfigRU|_kqQSpcPMgs@o z&5j-|EcM1frIJ7lGG9=@E88Vu&EMHyCiQXJSYA(B0~C})Rblda^@mU5t@~P}3}oL; znf@A6MNL8PHbC;s`$a>M=B=Nzu8{j1hOB^n%1~KyNhaE zqT40petQbfd5Wo`Uv%;%`;gnqFJDm4d*N?skEz0iWA5~OuM%`-r1hw&m-`lCs(7@f z{?n2f^R#j__DD{hVN`w*Q_1t7&htE}<@^rQ3+}IN_WXyb;;+vV{>CL%^FQp=I_v&c zaSo=6%mWuTEU(TtSaG4UU#9fmEhH87(116}dYQ>mmK<{JyP=Y@;EESWN}wwGcO6pL z_*OSbKvg4NfAhQpm@3Zy=C!csPMe?mC3vUj)#sj=Dr{7jy2mmtK6zXE#%o!9GZ6*` tH}rsC^SG%kqGrOmnlE!$)c!DIameqq@4c^k5?Qyc_~-j;)z9-FYXAe!MH2u3 delta 101 zcmZpl$9Qxm;|3E6L8W#^H`ZqxS@Iabz-RH~ScwypZ6zfp=Sn6_eky4&SyxJ8a;%iW xxBvhE diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 8e3f3954bba227bfb69c065183642817362afbb0..925e47f076b767916745b45afa33a53be07c8c82 100644 GIT binary patch delta 101 zcmeC5&Ukb>;|3E6NuzG*0}IQ)yx7kG2Hu|6 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index d7ed6d7939b81b54e74f7f187eb783568d53a5d9..ec5b1fad20e255a27b3ca676f321c99e84f44f3c 100644 GIT binary patch literal 8 PcmZQzU~HGl4bK7q1$Y6` literal 8 PcmZQzU~Jo~+^q)y2TcMY diff --git a/.idea/misc.xml b/.idea/misc.xml index dce85f4..0d32c34 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/src/project-team-a.src.iml b/.idea/modules/src/project-team-a.src.iml index 7f26e0f..4f31c41 100644 --- a/.idea/modules/src/project-team-a.src.iml +++ b/.idea/modules/src/project-team-a.src.iml @@ -9,6 +9,10 @@ + + + + diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..90e0616b7352f986771d2f36aeba5912dd262998 GIT binary patch literal 4079 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 x && mx <= x + w && my >= y && my <= y + h) { + return true; + } else { + return false; + } + } +} diff --git a/src/main/java/bcit/comp2522/projectteama/StartMenu.java b/src/main/java/bcit/comp2522/projectteama/StartMenu.java new file mode 100644 index 0000000..39f5b75 --- /dev/null +++ b/src/main/java/bcit/comp2522/projectteama/StartMenu.java @@ -0,0 +1,27 @@ +package bcit.comp2522.projectteama; + +import java.util.ArrayList; + +public class StartMenu { + + Window window; + + //Instantiate menu buttons + Button newGameButton; + Button quitButton; + + ArrayList