Skip to content
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.

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

Feedback (Do not close) #1

Open
wants to merge 362 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
3b0ec2f
Merge pull request #53 from COMP2522/52-gs-create-client
nathanb1357 Mar 27, 2023
ab37363
fixed issue 79 by implementing the fire animation in the modified code.
SimratKaur2 Mar 27, 2023
5365d7b
Merge pull request #80 from COMP2522/79-sk
nathanb1357 Mar 27, 2023
a314dde
NPC class added for villager.
amritjhatu Mar 27, 2023
c3556a0
Added NPC interactions. Still adjusting for world view.
amritjhatu Mar 27, 2023
24f8780
Completed the adjustment of the NPC. Displays currently under the pla…
amritjhatu Mar 27, 2023
d46df12
Merge pull request #86 from COMP2522/81-aj_81_change-npc
SimratKaur2 Mar 27, 2023
f87e66a
fixed issue 87 by fixing player's collision with objects.
SimratKaur2 Mar 28, 2023
75a0d18
Merge pull request #88 from COMP2522/87-sk
nathanb1357 Mar 28, 2023
2fa7f0e
worked on issue 89 by modifying the map.
SimratKaur2 Mar 28, 2023
c478a82
Merge branch 'main' into 89-sk
SimratKaur2 Mar 28, 2023
0dafdd4
Merge pull request #90 from COMP2522/89-sk
abhishekchouhannk Mar 28, 2023
2327a29
fixed issue 91 by renaming the Object class.
SimratKaur2 Mar 28, 2023
7b29daa
Base monster class and display added. Functionality still needed. Usi…
amritjhatu Mar 28, 2023
a93adcc
Merge pull request #93 from COMP2522/91-sk_91
abhishekchouhannk Mar 28, 2023
1722e11
Merge pull request #95 from COMP2522/92-aj_92_implement-monster
abhishekchouhannk Mar 28, 2023
08dec37
Javadoc added for monster class.
amritjhatu Mar 28, 2023
d1e36e3
Merge pull request #97 from COMP2522/96-aj_96_monster_javadoc
abhishekchouhannk Mar 28, 2023
d941ddf
fixed issue 94 by adding Javadocs for all my classes.
SimratKaur2 Mar 28, 2023
e562998
Merge pull request #98 from COMP2522/94-sk
abhishekchouhannk Mar 28, 2023
17f963d
refactored player class to be a singleton
abhishekchouhannk Mar 28, 2023
5472d0a
Merge pull request #100 from COMP2522/99-ac-player-singleton
amritjhatu Mar 28, 2023
cfd94f0
Assets added. Replace with better one later. Put him somewhere else o…
amritjhatu Mar 28, 2023
0e981a3
fixing issue 101 by refactoring code for my classes.
SimratKaur2 Mar 28, 2023
5cd87f9
Merge branch 'main' into 101-sk
SimratKaur2 Mar 28, 2023
4aab04b
fixed issue 101 by refactoring code for my classes.
SimratKaur2 Mar 28, 2023
6661f71
Merge pull request #105 from COMP2522/101-sk
nathanb1357 Mar 28, 2023
db6344c
Merge branch 'main' into 103-aj_103_monsterassets
nathanb1357 Mar 28, 2023
8d98667
Merge pull request #104 from COMP2522/103-aj_103_monsterassets
nathanb1357 Mar 28, 2023
618315e
Quick documentation fix
nathanb1357 Mar 28, 2023
df1e14a
added UP movement sprites for player
abhishekchouhannk Mar 28, 2023
d9eba34
Started menu and ImagePanel with background image
gregjsong Mar 28, 2023
9868ccd
Started menu and ImagePanel with background image
gregjsong Mar 28, 2023
30e7f1d
Fixed a few issues from the lab
nathanb1357 Mar 28, 2023
d953578
fixed issue 193 by spreading out the elements.
SimratKaur2 Mar 28, 2023
93e4527
Merge pull request #194 from COMP2522/193-sk
gregjsong Mar 29, 2023
1f6900a
Added Javadoc and TODO's for running Client requests and GamePanel.
gregjsong Mar 29, 2023
cc0704e
Added Javadoc and TODO's for running Client requests and GamePanel.
gregjsong Mar 29, 2023
3af08f7
Added Javadoc and TODO's for running Client requests and GamePanel.
gregjsong Mar 29, 2023
e3353b3
Merge pull request #195 from COMP2522/GS_83_implement_menu
nathanb1357 Mar 29, 2023
4c3daa3
Pointless instance variables removed. The call in the handlers deal w…
amritjhatu Mar 29, 2023
fc3d861
Merge pull request #196 from COMP2522/AJ_170-can-remove-these-instanc…
abhishekchouhannk Mar 30, 2023
85cd04a
Code placed into a method to fix collision issue. Coordinates of vill…
amritjhatu Mar 30, 2023
9bda9ee
More changes made to Entity since setAction was missing after refactor.
amritjhatu Mar 30, 2023
648a86e
Merge pull request #205 from COMP2522/aj_204_collide
abhishekchouhannk Mar 30, 2023
2e18394
merged main
gregjsong Mar 30, 2023
8894c3f
Failed at projectiles. Fixed npc to player collisions. Fixed monster …
amritjhatu Mar 30, 2023
f904185
Merge pull request #207 from COMP2522/aj_206_projectile_boulder_monster
nathanb1357 Mar 30, 2023
71356a9
added sound play methods
SimratKaur2 Mar 30, 2023
fbbe73a
fixed issue 208 by implementing background sound for the game.
SimratKaur2 Mar 30, 2023
a874873
Merge pull request #209 from COMP2522/208-sk
abhishekchouhannk Mar 30, 2023
40aa844
removed unnecessary file
abhishekchouhannk Mar 31, 2023
70ffd1c
made ruby stats display:
abhishekchouhannk Mar 31, 2023
973f2ef
added method to display UI components and show informative message wh…
abhishekchouhannk Mar 31, 2023
35cfeba
updated message ocomponent to show for a maximum of 2 seconds
abhishekchouhannk Mar 31, 2023
c4ad387
Merge pull request #211 from COMP2522/210-ac-implement-ui
amritjhatu Mar 31, 2023
9837896
fixed issue 213 by implementing sound for the all the elements.
SimratKaur2 Mar 31, 2023
812e221
Merge pull request #214 from COMP2522/213-sk
abhishekchouhannk Mar 31, 2023
535275b
checkEntity renamed to checkEntity Collide. CollisionDetector and Pla…
amritjhatu Mar 31, 2023
428a7de
Changed the if else in movement to switch statements
amritjhatu Apr 1, 2023
35af35f
Merge pull request #215 from COMP2522/aj_127_rename_checkentity
SimratKaur2 Apr 1, 2023
c39d8ff
Merge pull request #216 from COMP2522/aj_172_switch_magicnum
SimratKaur2 Apr 1, 2023
ed2a69c
fixed issue 217 by writing tests for testing the functionality of all…
SimratKaur2 Apr 1, 2023
a522e6b
worked in issue 217 to correct the method type that was changed by mi…
SimratKaur2 Apr 1, 2023
2b6d896
Merge pull request #218 from COMP2522/217-sk
amritjhatu Apr 1, 2023
f53885e
added player lives sprites
abhishekchouhannk Apr 1, 2023
18f960a
added player life class object for displaying on screen
abhishekchouhannk Apr 1, 2023
8d47108
added constructor to setup life object with three different states
abhishekchouhannk Apr 1, 2023
d759a3b
Merge to main
gregjsong Apr 1, 2023
19b74bb
Implemented SaveState. Added needed getters to Player.
gregjsong Apr 1, 2023
cf75bb1
merging main
gregjsong Apr 1, 2023
45ee9e4
Implemented SaveState. Added needed getter to Player.
gregjsong Apr 1, 2023
11cc60b
Merge pull request #220 from COMP2522/GS_83_implement_menu
abhishekchouhannk Apr 1, 2023
da2b049
implemented player lives HUD display:
abhishekchouhannk Apr 1, 2023
5a88b6f
Brief tests added. Setters and getters added.
amritjhatu Apr 1, 2023
41af7c0
Merge pull request #222 from COMP2522/aj_221_test_cases
gregjsong Apr 1, 2023
a5efdce
pull from main
gregjsong Apr 1, 2023
bc67ba3
added player life display system and it works
abhishekchouhannk Apr 1, 2023
0c26039
resolved merge conflicts and edited some variables
abhishekchouhannk Apr 1, 2023
50de822
made fixes
abhishekchouhannk Apr 1, 2023
35f2f0b
Merge pull request #224 from COMP2522/219-ac_display_ives
gregjsong Apr 1, 2023
6969cca
Implemented SaveStateHandler. Made Entity an Element implement Positi…
gregjsong Apr 1, 2023
a1da8a7
Changed ElementHandler to use setters for worldX and worldY for Entit…
gregjsong Apr 2, 2023
f5c3152
fixed issue 226 by writing tests to ensure the good functioning of th…
SimratKaur2 Apr 2, 2023
cbe7be3
fixed issue 227 by correcting my individual pitch.
SimratKaur2 Apr 2, 2023
9384890
Merge pull request #229 from COMP2522/227-sk
amritjhatu Apr 2, 2023
018a8dc
Fixed error with nullpointerexception in SaveState and now filters ou…
gregjsong Apr 2, 2023
289b198
Removed main method in SaveStateHandler
gregjsong Apr 2, 2023
bb3b9f7
Merge pull request #228 from COMP2522/226-sk
gregjsong Apr 2, 2023
5db6e66
Merge remote-tracking branch 'origin/main'
gregjsong Apr 2, 2023
cb3d52a
Commiting updates.
gregjsong Apr 2, 2023
bec00a1
Changes pushed a bit.
amritjhatu Apr 2, 2023
aaca928
Player loses life when interacting with NPC
amritjhatu Apr 2, 2023
566aafc
Merge pull request #231 from COMP2522/aj_225_monster_advancement
abhishekchouhannk Apr 2, 2023
920f332
Merge pull request #230 from COMP2522/GS_223_create_savestatehandler
amritjhatu Apr 2, 2023
8e0d635
added a few tests to the entity class. Mainly checking for direction …
amritjhatu Apr 2, 2023
ca2fbbd
Merge pull request #243 from COMP2522/aj_242_entity_tests
abhishekchouhannk Apr 2, 2023
3529697
Failed? Trying again.
amritjhatu Apr 2, 2023
8a8ec83
Merge pull request #244 from COMP2522/aj_242_entity_tests
SimratKaur2 Apr 2, 2023
40fc78d
Some tests added for villagers.
amritjhatu Apr 2, 2023
e6b58a7
Merge pull request #246 from COMP2522/aj_245_villager_test
nathanb1357 Apr 2, 2023
03c3b2a
Fixed all my issues from the lab
nathanb1357 Apr 2, 2023
d512c25
fixed issue with STIFF monster and NPC:
abhishekchouhannk Apr 2, 2023
628b46f
Merge pull request #247 from COMP2522/187-fix-small-issues
abhishekchouhannk Apr 2, 2023
fd555a1
Merge remote-tracking branch 'origin/main'
gregjsong Apr 2, 2023
557a708
Temporary testing.
gregjsong Apr 2, 2023
80ff6eb
Monster added to different spots.
amritjhatu Apr 3, 2023
dcb94d9
Merge pull request #254 from COMP2522/aj_253_more_monsters
abhishekchouhannk Apr 3, 2023
b7c572f
added sprites for slimes
abhishekchouhannk Apr 3, 2023
84ef6d4
Created Game Loader to run menu and gamepanel.
gregjsong Apr 3, 2023
f651303
updated monster to show slimes instead
abhishekchouhannk Apr 3, 2023
b6264db
Changed Client and Server to use savestate.getinstance().
gregjsong Apr 3, 2023
013157a
Merge pull request #256 from COMP2522/255-ac_implement-pathfinding
gregjsong Apr 3, 2023
29a65fa
Merge remote-tracking branch 'origin/main'
gregjsong Apr 3, 2023
805d81a
Merging commits from main.
gregjsong Apr 3, 2023
30586d0
Merge pull request #257 from COMP2522/GS_248_menu_load_game
SimratKaur2 Apr 3, 2023
9348152
Revert "Gs 248 menu load game"
SimratKaur2 Apr 3, 2023
bf1e920
Merge pull request #258 from COMP2522/revert-257-GS_248_menu_load_game
abhishekchouhannk Apr 3, 2023
883a7ce
Redid player sprites
nathanb1357 Apr 3, 2023
99254f4
Deleted MenuHandler
gregjsong Apr 3, 2023
9f5889f
Merge pull request #259 from COMP2522/249-add-player-sprites
amritjhatu Apr 3, 2023
29ceb5b
Changed textfield and button sizes.
gregjsong Apr 3, 2023
db263e1
Testing save data retrieval
gregjsong Apr 3, 2023
9e77380
Testing save data retrieval
gregjsong Apr 3, 2023
b31b8cc
Working through pathfinder class.
amritjhatu Apr 3, 2023
01090be
More adjustments
amritjhatu Apr 3, 2023
182ae62
Fixed GamePanel losing focus issue.
gregjsong Apr 4, 2023
fccf1da
Added Javadoc for GameLoader.
gregjsong Apr 4, 2023
514b1d0
Merge pull request #264 from COMP2522/GS_248_menu_load_game
nathanb1357 Apr 4, 2023
28aca03
player hit box can be drawn now:
abhishekchouhannk Apr 4, 2023
aa7ca2a
Merge pull request #267 from COMP2522/266-fix-hitbox
nathanb1357 Apr 4, 2023
135c0f1
debugged code for Amrit
abhishekchouhannk Apr 4, 2023
9f31089
debugging issues
abhishekchouhannk Apr 4, 2023
f8b2063
debugged issues with pathfinding:
abhishekchouhannk Apr 4, 2023
844b23f
Merge pull request #268 from COMP2522/261-aj_261_pathfinding
nathanb1357 Apr 4, 2023
84b9e7b
Updated Project Pitch
nathanb1357 Apr 4, 2023
b43b456
Deleted unnessesary wav file
nathanb1357 Apr 4, 2023
76ae415
got issue 265 done by refactoring code to make it more efficient.
SimratKaur2 Apr 4, 2023
3794694
Merge pull request #269 from COMP2522/263-nb_263_update_readme
abhishekchouhannk Apr 4, 2023
e0fb99f
Merge pull request #270 from COMP2522/265-sk
nathanb1357 Apr 4, 2023
1a7350b
Minor refactoring. checkcollide commented out for now since method is…
amritjhatu Apr 4, 2023
6241cf5
added player attack sprites
abhishekchouhannk Apr 4, 2023
6b16f5e
Merge pull request #272 from COMP2522/aj_271_collision_cleanup
nathanb1357 Apr 4, 2023
7cf8f74
Made savestate load monster, npc, elements arrays
gregjsong Apr 4, 2023
5d7f5c1
Made savestate load monster, npc, elements arrays
gregjsong Apr 4, 2023
86a4c4c
Merging.
gregjsong Apr 4, 2023
ffbac7a
Merge pull request #274 from COMP2522/GS_248_menu_load_game
amritjhatu Apr 4, 2023
7017122
Fixed previous git merge
nathanb1357 Apr 4, 2023
f752c64
Refactored code up to Entity
nathanb1357 Apr 4, 2023
41b3c2d
Finished all non-test refactoring
nathanb1357 Apr 4, 2023
d64a813
Finished refactoring the tests
nathanb1357 Apr 4, 2023
9772c85
Merge pull request #277 from COMP2522/276-nb_refactor_major_code
SimratKaur2 Apr 5, 2023
5aee9e3
Created blank file under save folder
nathanb1357 Apr 5, 2023
1577e95
documented the sound class
abhishekchouhannk Apr 8, 2023
46b31d5
added documentation to collision detector
abhishekchouhannk Apr 8, 2023
c5a4ab8
updated player class to utilize helper functions
abhishekchouhannk Apr 8, 2023
1df32e5
updated player documnetation
abhishekchouhannk Apr 8, 2023
ede9ace
finished documenting and refactoring player class
abhishekchouhannk Apr 8, 2023
e1da63b
Merge pull request #284 from COMP2522/283-add-gameover
amritjhatu Apr 8, 2023
af85ef6
fixed a minor issue
abhishekchouhannk Apr 8, 2023
ae1cf78
fixed some author names in classes
abhishekchouhannk Apr 8, 2023
0d3ce42
refactored monster/entity class as they had some issues
abhishekchouhannk Apr 8, 2023
46794a8
modified whole project to use getters/setters for worldX and WorldY
abhishekchouhannk Apr 8, 2023
d12eda4
made a new package in projects folder to enforce protected variables
abhishekchouhannk Apr 8, 2023
9af2291
made a new package to organize server side stuff
abhishekchouhannk Apr 8, 2023
f508125
organized code
abhishekchouhannk Apr 8, 2023
e97cef8
modified entity class to use getters and setters
abhishekchouhannk Apr 8, 2023
ac2bda0
enforcing encapsulation in Entity class:
abhishekchouhannk Apr 8, 2023
632f4e7
fixed collision with fire
abhishekchouhannk Apr 8, 2023
a016fdc
enforced encapsulation in Entity class
abhishekchouhannk Apr 8, 2023
36a9c8e
finalise changes
abhishekchouhannk Apr 8, 2023
6f1868c
Merge pull request #286 from COMP2522/285-refactor-code-entity
amritjhatu Apr 8, 2023
d0e7be6
reorganized classes into packages
abhishekchouhannk Apr 8, 2023
c5379c6
remove unncessary code
abhishekchouhannk Apr 8, 2023
167deb5
organizing code
abhishekchouhannk Apr 9, 2023
8935e4c
added comments to code
abhishekchouhannk Apr 9, 2023
3077843
updated documentation in collision detector
abhishekchouhannk Apr 9, 2023
195e5a4
added documentation
abhishekchouhannk Apr 9, 2023
2841838
added game over sequence
abhishekchouhannk Apr 9, 2023
81f6b09
Merging.
gregjsong Apr 9, 2023
c659a6d
Merge remote-tracking branch 'origin/main'
gregjsong Apr 9, 2023
d086c06
updated tileManager to encapsulate map data
abhishekchouhannk Apr 9, 2023
05b1bcc
updated player to die whenever life = 0
abhishekchouhannk Apr 9, 2023
68b0a49
Merge pull request #287 from COMP2522/278-nb_278_create_game_over
amritjhatu Apr 9, 2023
7ab26cb
quick bug fix by commenting line
abhishekchouhannk Apr 9, 2023
5471383
updated my project pitch
abhishekchouhannk Apr 9, 2023
3491280
added a spawn system for rubies
abhishekchouhannk Apr 9, 2023
7e717d3
Merge pull request #288 from COMP2522/144-elementhandler
amritjhatu Apr 9, 2023
902fa7a
Updated Menu to use graphics.
gregjsong Apr 9, 2023
9ef50ae
Merge remote-tracking branch 'origin/main'
gregjsong Apr 9, 2023
bc9a7b5
Amrit's Pitch Edited and expanded with retrospective.
amritjhatu Apr 9, 2023
ca325b5
fixed issue 150 by reducing code duplication.
SimratKaur2 Apr 9, 2023
a40db99
Merge pull request #293 from COMP2522/150-sk
abhishekchouhannk Apr 9, 2023
49a814c
worked on issue 294 by adding comments and making code more readable.
SimratKaur2 Apr 9, 2023
e640c4f
Merge branch 'main' into 294-sk
SimratKaur2 Apr 9, 2023
2b7c64e
Merge pull request #290 from COMP2522/GS_289_update_menu
abhishekchouhannk Apr 9, 2023
27056a0
Merge pull request #292 from COMP2522/aj_291_update_readme
abhishekchouhannk Apr 9, 2023
636499b
Merge pull request #295 from COMP2522/294-sk
abhishekchouhannk Apr 9, 2023
892c30b
Revert "Improved code readability"
abhishekchouhannk Apr 9, 2023
0388577
Merge pull request #296 from COMP2522/revert-295-294-sk
abhishekchouhannk Apr 9, 2023
2019fe6
restore this branch
abhishekchouhannk Apr 9, 2023
63a42d6
Merge pull request #297 from COMP2522/GS_289_update_menu
abhishekchouhannk Apr 9, 2023
3f40233
Some checkstyle issues fixed. Some.
amritjhatu Apr 9, 2023
d3bc0cc
worked on issue 294 by adding comments and making code more readable.
SimratKaur2 Apr 9, 2023
f7cb14b
documented the pathfinder class
abhishekchouhannk Apr 9, 2023
81e157b
Merge pull request #301 from COMP2522/299-sk
abhishekchouhannk Apr 9, 2023
8ec7718
Updated to use thread in SaveStateHandler.save(). Edited Client.
gregjsong Apr 10, 2023
6ae5064
Edited CollisionDetector to include a helper method to make more clear.
gregjsong Apr 10, 2023
1079f07
Merge branch 'main' into aj_298_checkstyle_part1
gregjsong Apr 10, 2023
57eb98c
Merge pull request #300 from COMP2522/aj_298_checkstyle_part1
gregjsong Apr 10, 2023
9d2b237
Added UML Diagram and fixed some checkstyle errors
nathanb1357 Apr 10, 2023
86c73c3
Autoformatted a bunch of classes
amritjhatu Apr 10, 2023
6438287
Started documentation.
gregjsong Apr 10, 2023
3a3f4da
Merge pull request #308 from COMP2522/aj_307_checkstyle_pt2
gregjsong Apr 10, 2023
d35ca4a
Revert "Autoformatted a bunch of classes"
gregjsong Apr 10, 2023
1aa6c22
Merge pull request #310 from COMP2522/revert-308-aj_307_checkstyle_pt2
abhishekchouhannk Apr 10, 2023
407c260
Merge pull request #303 from COMP2522/GS_120-looks-like-this-line-rel…
abhishekchouhannk Apr 10, 2023
1ae355a
Started documentation.
gregjsong Apr 10, 2023
dbc60b7
Merge pull request #309 from COMP2522/gs_304_working_on_documentation
amritjhatu Apr 10, 2023
5334a3a
updated pathFinder and Node class, to utilize network of nodes and sp…
abhishekchouhannk Apr 10, 2023
328ad7a
Merge pull request #312 from COMP2522/311-network-of-nodes
amritjhatu Apr 10, 2023
2be89a2
Added UML Diagram and fixed some checkstyle errors
nathanb1357 Apr 10, 2023
5e12f9d
Merge remote-tracking branch 'origin/262-nb_update_uml' into 262-nb_u…
nathanb1357 Apr 10, 2023
8d85114
Fixed conflicting files
nathanb1357 Apr 10, 2023
799d529
Merge pull request #305 from COMP2522/262-nb_update_uml
amritjhatu Apr 10, 2023
6c98238
Mass auto format on most files.
amritjhatu Apr 10, 2023
7cb10c2
Merge pull request #314 from COMP2522/aj_313_checkstyle_auto
gregjsong Apr 10, 2023
9c2e7fd
Started documentation.
gregjsong Apr 10, 2023
ee94159
Started documentation.
gregjsong Apr 10, 2023
674560d
Started documentation.
gregjsong Apr 10, 2023
102a694
Merge pull request #316 from COMP2522/gs_304_working_on_documentation
abhishekchouhannk Apr 10, 2023
6b14426
modified system variables to conform to checkstyle
abhishekchouhannk Apr 10, 2023
1182c2e
added javadocs for System Variables class
abhishekchouhannk Apr 10, 2023
960cf84
Some adjustments
amritjhatu Apr 10, 2023
e66fd5f
Accepting changes.
amritjhatu Apr 10, 2023
0bb5953
two files changed
amritjhatu Apr 10, 2023
4dc6efd
fixed main
abhishekchouhannk Apr 10, 2023
0a7bed6
Merge branch 'importfix' of https://github.com/COMP2522/project-amrit…
abhishekchouhannk Apr 10, 2023
aab7293
fixed issues with UI class
abhishekchouhannk Apr 10, 2023
9b901bb
fixed javadocs in sound
abhishekchouhannk Apr 10, 2023
7b2921f
Update README.md
gregjsong Apr 10, 2023
aaf19ed
Update README.md
gregjsong Apr 10, 2023
750da19
Update README.md
gregjsong Apr 10, 2023
81c25d5
fixed Life
abhishekchouhannk Apr 10, 2023
9959cd6
Update README.md
gregjsong Apr 10, 2023
01503e0
Merge branch 'main' into importfix
abhishekchouhannk Apr 10, 2023
e1893eb
Merge pull request #318 from COMP2522/importfix
amritjhatu Apr 10, 2023
4c7afe2
Update README.md
gregjsong Apr 10, 2023
6484829
one final commit to update README.md
abhishekchouhannk Apr 10, 2023
a5e4c9b
Merge branch 'main' of https://github.com/COMP2522/project-amrit-abhi…
abhishekchouhannk 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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,8 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# build files
build
.gradle
/save/*
3 changes: 3 additions & 0 deletions .idea/.gitignore

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

1 change: 1 addition & 0 deletions .idea/.name

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

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

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

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

13 changes: 13 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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/json_simple_1_1_1.xml

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

12 changes: 12 additions & 0 deletions .idea/libraries/mongodb_driver_sync.xml

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

11 changes: 11 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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/Project_Ruby.iml

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/Project_Ruby.main.iml

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

12 changes: 12 additions & 0 deletions .idea/modules/Project_Ruby.test.iml

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

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

Loading