Skip to content

1 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZhengHanShuu wants to merge 52 commits into
base: dl_01_test
Choose a base branch
from
Open

1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e8e158a
Merge pull request #2 from COMP2522/dl_01_test
ZhengHanShuu Jan 24, 2023
a4e2aa5
Added project pitch and outlines in the Pitch.md file
CharlesKim1105 Jan 24, 2023
ad7d0bb
initial commit
ZhengHanShuu Mar 7, 2023
9ee16c6
added backgournd
ZhengHanShuu Mar 25, 2023
0e433e2
Expanded window and made it so that player spawns in middle
dlau72 Mar 25, 2023
c99cbe5
added background
ZhengHanShuu Mar 25, 2023
04227e8
added background
ZhengHanShuu Mar 25, 2023
f0e0c8d
Merge pull request #11 from COMP2522/dl_02_window
dlau72 Mar 25, 2023
883335b
added background
ZhengHanShuu Mar 25, 2023
f69c5a4
Merge branch 'main' into background_branches
dlau72 Mar 25, 2023
eedcb46
Merge remote-tracking branch 'origin/main'
ZhengHanShuu Mar 25, 2023
796a036
Merge pull request #10 from COMP2522/background_branches
dlau72 Mar 25, 2023
58b06a4
Merge remote-tracking branch 'origin/main'
ZhengHanShuu Mar 25, 2023
9dc2a8e
initial commit
ZhengHanShuu Mar 25, 2023
7deb8e7
Modified start menu class and window class + button class to account …
dlau72 Mar 27, 2023
73fa6ca
Created collidable interface to be implemented by Player, enemy and b…
dlau72 Mar 27, 2023
433aec0
Merge pull request #12 from COMP2522/dl_09_startMenu
ZhengHanShuu Mar 28, 2023
9b78f44
added databasehandler and edited bulletmanager
ZhengHanShuu Mar 28, 2023
36c2af5
Merge pull request #14 from COMP2522/jh_02_databasehandler
ZhengHanShuu Mar 28, 2023
94a4bd7
Created GameStateManager class and implemented in window
dlau72 Mar 28, 2023
3b90ab9
Merge branch 'main' into dl_13_gameState
dlau72 Mar 28, 2023
4654206
Merge pull request #15 from COMP2522/dl_13_gameState
dlau72 Mar 28, 2023
bbff27f
Push gamestatemanager class
dlau72 Mar 28, 2023
d432328
Merge remote-tracking branch 'origin/dl_13_gameState' into dl_13_game…
dlau72 Mar 28, 2023
e9a1239
Push gamestatemanager class
dlau72 Mar 28, 2023
ab90e92
Merge pull request #18 from COMP2522/dl_13_gameState
dlau72 Mar 28, 2023
8687305
Added width, height and hitbox fields to Sprite +refactor subclasses …
dlau72 Mar 29, 2023
775806d
Added movement for player
dlau72 Mar 30, 2023
781aab9
Merge pull request #32 from COMP2522/dl_31_addNecessaryFields
dlau72 Mar 30, 2023
b812cd3
Merge pull request #33 from COMP2522/dl_05_movement
dlau72 Mar 30, 2023
a73c73f
changed background image and adjust the button
ZhengHanShuu Mar 31, 2023
9e96560
Merge pull request #35 from COMP2522/jh_03_GamePage
ZhengHanShuu Mar 31, 2023
686e355
Create CODEOWNERS
pbucci Mar 31, 2023
f51b61f
Update README.md
pbucci Mar 31, 2023
1133fda
Update README.md
pbucci Mar 31, 2023
94dfbf0
Update CODEOWNERS
pbucci Mar 31, 2023
99c3406
Update README.md
pbucci Mar 31, 2023
f9003f7
Update README.md
pbucci Mar 31, 2023
33562a8
Update CODEOWNERS
pbucci Mar 31, 2023
9658bfd
Update CODEOWNERS
pbucci Mar 31, 2023
0a08bd2
Wrote bulletManager add method and bullet shooting functionality to p…
dlau72 Apr 2, 2023
42ba8ca
Merge pull request #37 from COMP2522/dl_36_bulletShooting
ZhengHanShuu Apr 3, 2023
e1d2b52
added two buttons to the main menu and created a game over menu class…
ZhengHanShuu Apr 3, 2023
a60b850
integrating new files
dlau72 Apr 4, 2023
daeb6fe
Merge pull request #40 from COMP2522/dl_39_collidableMethods
pbucci Apr 4, 2023
53bbf3f
Rewrote deleted methods
dlau72 Apr 4, 2023
20fb248
Made it so that CurrentScore is sent to database when player dies + m…
dlau72 Apr 7, 2023
fd99521
Merge pull request #38 from COMP2522/jh_04_newButton
dlau72 Apr 7, 2023
78291da
Comments
dlau72 Apr 7, 2023
81cf627
Merge pull request #42 from COMP2522/dl_41_databaseImplemet
ZhengHanShuu Apr 10, 2023
ca94b1a
Added some documentation and UML diagram
dlau72 Apr 10, 2023
ec22577
Merge pull request #43 from COMP2522/dl_41_databaseImplemet
ZhengHanShuu Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .gradle/7.5.1/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/7.5.1/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/7.5.1/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/7.5.1/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/7.5.1/fileHashes/resourceHashesCache.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/file-system.probe
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions .idea/google-java-format.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/libraries/Gradle__junit_junit_4_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_8_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_8_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_8_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_mongodb_bson_4_9_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_mongodb_bson_record_codec_4_9_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_mongodb_mongodb_driver_core_4_9_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_mongodb_mongodb_driver_sync_4_9_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_opentest4j_opentest4j_1_2_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/modules/bcit.comp2522.project-team-a.project-team-a.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions .idea/modules/bcit.comp2522.project-team-a.project-team-a.main.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 52 additions & 0 deletions .idea/modules/bcit.comp2522.project-team-a.project-team-a.test.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 42 additions & 1 deletion .idea/modules/project-team-a.main.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading