Skip to content

Feedback #1

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
github-classroom wants to merge 61 commits into
base: feedback
Choose a base branch
from
Open

Feedback #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
6f66c89
Setting up GitHub Classroom Feedback
github-classroom[bot] Jan 27, 2023
bb6b7c4
first one
NingFeng33 Jan 27, 2023
3db17c1
Merge pull request #2 from COMP2522/NF_00_start
yguo91 Jan 27, 2023
2ce79ab
Added gradle project
Appl3Kitti3 Jan 27, 2023
17aab1f
Merge pull request #3 from COMP2522/TD_01_javs
NingFeng33 Jan 27, 2023
5dc4378
Fixed error.
Appl3Kitti3 Jan 27, 2023
dfc907b
Fixed the error where PApplet dependency did not show.
Appl3Kitti3 Jan 27, 2023
ee2a8a0
Added the new files.
Appl3Kitti3 Jan 27, 2023
18795c6
1
NingFeng33 Jan 27, 2023
5c753e3
Merge branch 'main' of https://github.com/COMP2522/project-data-pirates
NingFeng33 Jan 27, 2023
b6bae55
Create ProjectPitch.md
yguo91 Feb 3, 2023
b90486b
Update ProjectPitch.md
yguo91 Feb 3, 2023
0139fea
first draft of Project pitch
yguo91 Feb 3, 2023
6d22bc2
revise the pitch file
NingFeng33 Feb 3, 2023
ec92e68
UML version1.0
NingFeng33 Feb 3, 2023
c0c5d60
Merge pull request #4 from COMP2522/NF_01_pitch
Appl3Kitti3 Feb 3, 2023
3e14cc1
New UML for Data Pirates.
Appl3Kitti3 Feb 3, 2023
bc36da4
Constructed the UML diagram requirements.
Appl3Kitti3 Feb 10, 2023
49cb39e
Merge remote-tracking branch 'origin/main'
Appl3Kitti3 Feb 10, 2023
dbf34fc
Create a playercharacter to build a a feature of player.
NingFeng33 Feb 19, 2023
7f63e66
Created the basic structure and gameplay of the game.
Appl3Kitti3 Feb 19, 2023
624f98d
Implemented Timer functions, entrance to a next scene, and a basic he…
Appl3Kitti3 Feb 20, 2023
88fb2aa
Created a health system for enemies. Will plan on calculating defense…
Appl3Kitti3 Feb 22, 2023
b7b393f
Fixed conflicts from main.
Appl3Kitti3 Feb 24, 2023
d443cc4
Merge pull request #7 from COMP2522/TD_01_javs
Appl3Kitti3 Feb 24, 2023
3a4eef2
Add KVPair, JSONReader, JSONWriter classes for top players list
yguo91 Mar 26, 2023
f3f92dc
Current State of the game. Next final steps, finalize the usage of JS…
Appl3Kitti3 Mar 29, 2023
33694e8
Current State of the game. Next final steps, finalize the usage of JS…
Appl3Kitti3 Mar 29, 2023
dff194f
Game Demo. Not entirely having all documentary but it works.
Appl3Kitti3 Mar 31, 2023
3997195
Merge branch 'main' into TD_01_javs
Appl3Kitti3 Mar 31, 2023
648adc4
Merge pull request #15 from COMP2522/TD_01_javs
yguo91 Mar 31, 2023
22fcfef
All the resources.
Appl3Kitti3 Mar 31, 2023
0b78859
Merge pull request #18 from COMP2522/TD_01_javs
yguo91 Mar 31, 2023
b02f28b
I made boundaries more smooth and gave an instruction panel. Also cre…
Appl3Kitti3 Apr 5, 2023
e044f34
I added sounds, for start room, and arena, along with the player shoo…
Appl3Kitti3 Apr 6, 2023
bd5803b
Game Demo. Not entirely having all documentary but it works.
jliao09 Apr 8, 2023
11072ae
Update README.md
Appl3Kitti3 Apr 9, 2023
eaa1df5
Cleansed Window class.
Appl3Kitti3 Apr 9, 2023
764c8bd
Update README.md
Appl3Kitti3 Apr 9, 2023
8292694
Update README.md
Appl3Kitti3 Apr 9, 2023
1d14bd4
Update README.md
Appl3Kitti3 Apr 9, 2023
4cf5b89
Added all Javadocs and satisfied most of Checkstyle.
Appl3Kitti3 Apr 10, 2023
0a002a4
Update README.md
Appl3Kitti3 Apr 10, 2023
32b06c7
Merge branch 'TD_01_javs' of https://github.com/COMP2522/project-data…
Appl3Kitti3 Apr 10, 2023
638c2e3
Update README.md
Appl3Kitti3 Apr 10, 2023
db82d71
Update README.md
Appl3Kitti3 Apr 10, 2023
9ed95f5
test
jliao09 Apr 10, 2023
756e983
test
jliao09 Apr 10, 2023
a64a325
test
jliao09 Apr 10, 2023
ee15844
test
jliao09 Apr 10, 2023
c3ac904
solve conflict
jliao09 Apr 10, 2023
b0942dd
test
jliao09 Apr 10, 2023
a996029
Merge remote-tracking branch 'origin/main'
jliao09 Apr 10, 2023
7ec58d3
fix conflict
jliao09 Apr 10, 2023
03eb269
Update TD_pitch.txt
Appl3Kitti3 Apr 10, 2023
0a1e15c
Rename TD_pitch.txt to TD_pitch.md
Appl3Kitti3 Apr 10, 2023
58d192c
Update TD_pitch.md
Appl3Kitti3 Apr 10, 2023
dcaf3bc
TeddyPitch and UML
Appl3Kitti3 Apr 10, 2023
f33bf19
Rename datapirates/documents/TD_pitch.md to datapirates/documents/Ted…
Appl3Kitti3 Apr 10, 2023
5697532
Added UML Diagram (Generated from IntelliJ)
Appl3Kitti3 Apr 10, 2023
b648113
pitch and test
jliao09 Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .idea/.name
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/checkstyle-idea.xml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/checkstyleidea-libs/readme.txt
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

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

17 changes: 17 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

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

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

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

65 changes: 65 additions & 0 deletions .idea/libraries-with-intellij-classes.xml
View file
Open in desktop

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

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

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

13 changes: 13 additions & 0 deletions .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.

6 changes: 6 additions & 0 deletions .idea/modules/datapirates.iml
View file
Open in desktop

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

29 changes: 29 additions & 0 deletions .idea/modules/datapirates.test.iml
View file
Open in desktop

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

Binary file added ...mmitted_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file added ...ncommitted_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file added ...committed_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file added ...f/Uncommitted_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/file-system.probe
View file
Open in desktop
Binary file not shown.
Binary file added ...helf/Uncommitted_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file added ...elf/Uncommitted_changes_before_Checkout_at_2023-02-19_3_37_p_m__[Changes]/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Loading