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

[CS2103T-T11-2] Dukemon #102

Open
wants to merge 882 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
882 commits
Select commit Hold shift + click to select a range
c155210
Merge pull request #193 from AY1920S1-CS2103T-T11-2/paul-8-ppp
dragontho Nov 4, 2019
8ac3ffb
Merge pull request #192 from AY1920S1-CS2103T-T11-2/yida-4-UGDG
kohyida1997 Nov 4, 2019
5601a17
Improve find command and update UG
chrischenhui Nov 4, 2019
f562468
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 4, 2019
dc235ad
Fix some check style
chrischenhui Nov 4, 2019
0e49ff2
Merge pull request #194 from AY1920S1-CS2103T-T11-2/chenhui-2-codeQua…
chrischenhui Nov 4, 2019
e302197
Yida PPP additional edits
kohyida1997 Nov 4, 2019
5e6ce31
Merging to stay updated with master
kohyida1997 Nov 4, 2019
c090591
Implement more sample data.
chrischenhui Nov 4, 2019
db31a05
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 4, 2019
586b23b
Pass check style
chrischenhui Nov 4, 2019
04e6fee
Pass Checkstyle
chrischenhui Nov 4, 2019
eb16d6c
Remove Exit from Game Mode
sreesubbash Nov 4, 2019
dabb96b
Pass checkstyle
chrischenhui Nov 4, 2019
bbd5579
Remove Exit from Game Mode
sreesubbash Nov 4, 2019
8c27129
Merge pull request #195 from AY1920S1-CS2103T-T11-2/chenhui-2-codeQua…
chrischenhui Nov 4, 2019
80ff0e5
Switch Commands purpose made clearer
sreesubbash Nov 4, 2019
cbc51c0
Switch Commands purpose made clearer
sreesubbash Nov 4, 2019
b675cb0
Cleaning up GameCommand tests
kohyida1997 Nov 4, 2019
1f0816a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
kohyida1997 Nov 4, 2019
cdf052a
Added AppManager diagram to DG
kohyida1997 Nov 4, 2019
9f230c0
Fix EOF error
kohyida1997 Nov 4, 2019
776f71e
Updated Timer diagrams
kohyida1997 Nov 4, 2019
e2fc031
Updated DG Diagrams
kohyida1997 Nov 4, 2019
65b9393
Fixing code quality
kohyida1997 Nov 4, 2019
506b2fd
Housekeeping of UG & DG, fixed PE Hints bugs
kohyida1997 Nov 4, 2019
eab0ac4
Implement auto creation of revision wordbank, whenever a card is wron…
chrischenhui Nov 4, 2019
130a5e2
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 4, 2019
dc00ec6
Add javadoc and fix failing test
chrischenhui Nov 4, 2019
877abc0
Merge pull request #199 from AY1920S1-CS2103T-T11-2/chenhui-8-revisio…
chrischenhui Nov 4, 2019
a446822
Reorder dg
jascxx Nov 5, 2019
a76ddc4
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
jascxx Nov 5, 2019
41d5fbb
Fix
jascxx Nov 5, 2019
96e9dd6
Merge pull request #200 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 5, 2019
b174236
Update statistics class diagram
jascxx Nov 5, 2019
8f2f812
Merge pull request #201 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 5, 2019
f1e2715
Fix revision bank bugs
chrischenhui Nov 5, 2019
bbdfaee
Subbash edits on my com
kohyida1997 Nov 5, 2019
5322620
Subbash edits on my com
kohyida1997 Nov 5, 2019
16e27a2
Shift some code
chrischenhui Nov 5, 2019
fb2868a
Pass checkstyle
chrischenhui Nov 5, 2019
f87a6ea
Fix build
chrischenhui Nov 5, 2019
13d700f
Fix isValidMeaning check for revision meaning
chrischenhui Nov 5, 2019
7a4f303
Implement revision bank
chrischenhui Nov 5, 2019
991cd7d
Merge pull request #202 from AY1920S1-CS2103T-T11-2/chenhui-8-revisio…
chrischenhui Nov 5, 2019
4ea1201
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
kohyida1997 Nov 5, 2019
5ad669e
Improved error messages in Parser Manager
sreesubbash Nov 5, 2019
689a075
Subbash 26 improve parse exception feedback
sreesubbash Nov 5, 2019
c3144fe
Revision to PPP
kohyida1997 Nov 5, 2019
32b1812
Resolved conflicts with master
kohyida1997 Nov 5, 2019
f9505f2
Pass addcommandtest and addcommandintegrationtest
chrischenhui Nov 5, 2019
1d0bc1a
Refined tests
kohyida1997 Nov 5, 2019
a7cf098
Added activity diagram for Timer (with Hints)
kohyida1997 Nov 5, 2019
1022a14
Merge pull request #204 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 5, 2019
15918a7
Pass deletecommandtest
chrischenhui Nov 5, 2019
35d677f
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 5, 2019
8773adc
Implement some importcommand test
chrischenhui Nov 5, 2019
f07a152
Fix checkstyle
chrischenhui Nov 5, 2019
526b3c0
Merge pull request #205 from AY1920S1-CS2103T-T11-2/chenhui-5-impleme…
chrischenhui Nov 5, 2019
a510703
Update ppp
chrischenhui Nov 6, 2019
6a62f83
Update ppp
chrischenhui Nov 6, 2019
e48294d
Updated Timer part for DG
kohyida1997 Nov 6, 2019
d1e68f2
DG Changes
kohyida1997 Nov 6, 2019
f3960e6
Merge pull request #206 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 6, 2019
1fd7089
Fix wordbankstats not removed when wb is removed
jascxx Nov 6, 2019
84e8c71
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
jascxx Nov 6, 2019
12338d5
Fix style
jascxx Nov 6, 2019
7d20a3a
Merge pull request #207 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 6, 2019
4b43de4
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 6, 2019
f90fba0
Update DG PPP
chrischenhui Nov 6, 2019
18fefb2
Update diagrams in DG
chrischenhui Nov 7, 2019
9476aed
Update DG
chrischenhui Nov 7, 2019
451608d
Update DG
jascxx Nov 7, 2019
cb84950
Update DG
jascxx Nov 7, 2019
f77ff6a
Merge pull request #209 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 7, 2019
463dd2e
Add note to UG
jascxx Nov 7, 2019
8d014b7
Implement reset command for wordbankstatistics
jascxx Nov 7, 2019
abfa980
Implement reset command
jascxx Nov 7, 2019
4e78bed
Fix style
jascxx Nov 7, 2019
73f900a
Merge pull request #210 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 7, 2019
d692010
Removed redundant variables in ModularDisplay
therealdragontho Nov 7, 2019
53df472
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
therealdragontho Nov 7, 2019
4156d7a
Changed UI part of DG to fit Dukemon
therealdragontho Nov 7, 2019
673bb74
Added new parts to my PPP and cleaned up some code
therealdragontho Nov 7, 2019
8bd03cc
Merge pull request #211 from AY1920S1-CS2103T-T11-2/paul-8-ppp
dragontho Nov 7, 2019
e8a8658
Complete DG
chrischenhui Nov 7, 2019
629a995
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 7, 2019
052fcf7
Fix compile error n checkstyle
chrischenhui Nov 7, 2019
a7e6727
Merge pull request #212 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 7, 2019
1469b6b
Formatting PPP
kohyida1997 Nov 7, 2019
6bf76b4
Polish DG
chrischenhui Nov 7, 2019
f7d9182
FIX comments
sreesubbash Nov 8, 2019
bf0d4de
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/main
sreesubbash Nov 8, 2019
0de9af1
Move some tests to ParserManager
sreesubbash Nov 8, 2019
479d608
Fix UG mistake
jascxx Nov 8, 2019
0ee16d5
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
jascxx Nov 8, 2019
33cf8bb
Reorder UG
jascxx Nov 8, 2019
06da9a7
Fix font
jascxx Nov 8, 2019
b5d6d55
Fix grammar
jascxx Nov 8, 2019
1b08513
Minor update
jascxx Nov 8, 2019
b436236
Merge pull request #213 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 8, 2019
c054962
Minor UG update
jascxx Nov 8, 2019
c93e77d
Minor format update
jascxx Nov 8, 2019
fc7ae53
Merge pull request #214 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 8, 2019
1dd13a8
Very minor UG update
jascxx Nov 8, 2019
dc8a1dc
Merge pull request #215 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 8, 2019
ba3899c
Change pronoun "I" to "we"
chrischenhui Nov 8, 2019
4b80d66
Improve some code quality
chrischenhui Nov 8, 2019
8e66235
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 8, 2019
1b11388
PPP Update
kohyida1997 Nov 8, 2019
e4f6f95
Resolved Merge conflicts
kohyida1997 Nov 8, 2019
081a9ec
Merge pull request #217 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 8, 2019
29c6307
Housekeeping, improving readability of code chunks
kohyida1997 Nov 8, 2019
a5b6d99
Merge pull request #218 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 8, 2019
feb688e
Update PPP
chrischenhui Nov 8, 2019
ce11908
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 8, 2019
c7d8b40
Update to DG, improve PPP
chrischenhui Nov 8, 2019
62abea4
Merge pull request #219 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 8, 2019
b1660d9
Updating DG for Hints
kohyida1997 Nov 8, 2019
2b7402f
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
kohyida1997 Nov 8, 2019
9c19bfd
Update PPP
chrischenhui Nov 9, 2019
3e9c942
Updated images
sreesubbash Nov 9, 2019
518aa0b
Update PPP
chrischenhui Nov 9, 2019
0623db9
Final ppp update without latest diagrams
sreesubbash Nov 9, 2019
06a7f0f
Cleaned up PPP
therealdragontho Nov 9, 2019
c1690bd
Polish PPP
chrischenhui Nov 9, 2019
9424e3e
Optimization
kohyida1997 Nov 9, 2019
a2d7bd5
Update ppp
chrischenhui Nov 9, 2019
5944000
Optimization
kohyida1997 Nov 9, 2019
d7e7da7
Add author tags for classes I implemented. Common classes untouched
chrischenhui Nov 9, 2019
7b5a05a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 9, 2019
79be948
Cleaning up tests
kohyida1997 Nov 9, 2019
eec9d35
Minor changes
kohyida1997 Nov 9, 2019
f36454b
Improve some code quality
chrischenhui Nov 9, 2019
885c312
Update UG, DG, PPP
chrischenhui Nov 9, 2019
76052dd
Update PPP, DG
chrischenhui Nov 9, 2019
1852243
Fix checkstyle
chrischenhui Nov 9, 2019
d4cf7e9
Fix some gradlew issues
chrischenhui Nov 9, 2019
5148b76
Merge pull request #220 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 9, 2019
b333751
Final PPP
sreesubbash Nov 10, 2019
d5fd049
remove trailing spaces
sreesubbash Nov 10, 2019
a2a960b
Merge pull request #216 from AY1920S1-CS2103T-T11-2/subbash-27-finalP…
sreesubbash Nov 10, 2019
94c7f9d
Reset files to old version from subbash-26 branch
sreesubbash Nov 10, 2019
a587a99
Reset files to old version from subbash-26 branch
sreesubbash Nov 10, 2019
ae26d1a
PPP
jascxx Nov 10, 2019
5c725bf
Minor update
jascxx Nov 10, 2019
5e28f3f
Very minor update
jascxx Nov 10, 2019
3d85d12
Changing Site Headers
kohyida1997 Nov 10, 2019
561c058
Resolved merge conflicts
kohyida1997 Nov 10, 2019
3a1b4cf
Removed .html file
kohyida1997 Nov 10, 2019
89141c1
Changed Header files
kohyida1997 Nov 10, 2019
aa5bf52
Fixed trailing whitespace
kohyida1997 Nov 10, 2019
ddf4f43
Changed Header Files
kohyida1997 Nov 10, 2019
c5d8b8a
Clean up commented tests
sreesubbash Nov 10, 2019
eee9d76
Clean up funtional code
sreesubbash Nov 10, 2019
4b673e7
PPP is now 10 pages
sreesubbash Nov 10, 2019
a4936b5
Add more documentations
chrischenhui Nov 10, 2019
05fcb2c
Add more documentations
chrischenhui Nov 10, 2019
c16f1f6
Merge pull request #223 from AY1920S1-CS2103T-T11-2/subbash-29-finalC…
sreesubbash Nov 10, 2019
629e7fd
Pass checkstyle
chrischenhui Nov 10, 2019
8a11f7f
Pass lots of card command tests
chrischenhui Nov 10, 2019
100a078
Add some more tests
chrischenhui Nov 10, 2019
26a354f
Fix checkstyle
chrischenhui Nov 10, 2019
6260864
Update gradlew for travis
chrischenhui Nov 10, 2019
fd704ef
Remove some gradlew file
chrischenhui Nov 10, 2019
083a629
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 10, 2019
d7a55ac
Fix build
chrischenhui Nov 10, 2019
a67a88e
Merge pull request #224 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 10, 2019
9dc2b05
Update tests
jascxx Nov 10, 2019
dd27f68
Fix style
jascxx Nov 10, 2019
c578dd5
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
jascxx Nov 10, 2019
070c8fb
PPP, UG and DG edits
kohyida1997 Nov 10, 2019
bf3f3e2
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
kohyida1997 Nov 10, 2019
ed0075c
Cleaning up functional code
kohyida1997 Nov 10, 2019
dc624c7
Merge pull request #226 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 10, 2019
b17ddaa
Applied minor fix to appSettings tampering
therealdragontho Nov 10, 2019
4d78413
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
therealdragontho Nov 10, 2019
eb87a84
Some minor bug fix, and documentation
chrischenhui Nov 10, 2019
8f9cf5a
Fix test and pass checkstyle
chrischenhui Nov 10, 2019
24a59e2
Changed timer pictures to reflect the proper decimal points.
therealdragontho Nov 10, 2019
c10127b
Finalise PPP
chrischenhui Nov 10, 2019
e4f6e72
Add new line to fix travis
chrischenhui Nov 10, 2019
88cfad6
Fix spelling
chrischenhui Nov 10, 2019
6c5c3ea
Merge pull request #228 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 10, 2019
98a0243
PPP Updates
kohyida1997 Nov 10, 2019
4221fe6
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
kohyida1997 Nov 10, 2019
ff3577f
PPP Updates
kohyida1997 Nov 10, 2019
b63bc0e
Merge pull request #229 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 10, 2019
99f0270
Manual Testing Instructions in DG
kohyida1997 Nov 10, 2019
8a59077
Merge pull request #230 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 10, 2019
cb013f3
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
therealdragontho Nov 10, 2019
46358b1
Changed Ui diagrams to adapt to new shadowing
therealdragontho Nov 10, 2019
7f4ed36
Merge pull request #227 from AY1920S1-CS2103T-T11-2/paul-8-ppp
dragontho Nov 10, 2019
38a649c
Minor change, diagram is larger
sreesubbash Nov 11, 2019
e603332
Merge pull request #231 from AY1920S1-CS2103T-T11-2/subbash-29-finalC…
sreesubbash Nov 11, 2019
97f67b7
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 11, 2019
860fad8
Improve consistency in UGDG
chrischenhui Nov 11, 2019
53f339b
yida-5-MoreDocs
kohyida1997 Nov 11, 2019
f09fe07
Improve consistency in DG
chrischenhui Nov 11, 2019
0610d55
Added DG Manual Testing Instructions
kohyida1997 Nov 11, 2019
9910082
Update PPP to reflect changes in UGDG
chrischenhui Nov 11, 2019
5659535
Merge pull request #233 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
51ae8ec
Updated Icons in UG
kohyida1997 Nov 11, 2019
baa2397
Resolved merge conflict
kohyida1997 Nov 11, 2019
2e2b104
Moved .png credits
kohyida1997 Nov 11, 2019
078dfb2
Merge pull request #234 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 11, 2019
0d4fc7a
Updated ReadMe.adoc with .png credits (Doc)
kohyida1997 Nov 11, 2019
9e8bfde
Update PPP links to DG
chrischenhui Nov 11, 2019
000006e
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 11, 2019
1e8c273
Merge pull request #235 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
4349f6a
Update PPP's UG link
chrischenhui Nov 11, 2019
577ad3f
Add new line character
chrischenhui Nov 11, 2019
7be4938
Fix image size
chrischenhui Nov 11, 2019
ea6571c
Final fix to PPP, hopefully
chrischenhui Nov 11, 2019
9bf6231
Remove space
chrischenhui Nov 11, 2019
6ed11ec
Merge pull request #236 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
f5f942b
Made minor grammar adjustments
therealdragontho Nov 11, 2019
6a14670
Merged conflicts and fixed broken links
therealdragontho Nov 11, 2019
d393b74
Merge pull request #237 from AY1920S1-CS2103T-T11-2/paul-8-ppp
dragontho Nov 11, 2019
7668898
Correct Use cases
sreesubbash Nov 11, 2019
85604f9
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
sreesubbash Nov 11, 2019
02f5609
Merge pull request #238 from AY1920S1-CS2103T-T11-2/subbash-29-finalC…
sreesubbash Nov 11, 2019
c095a39
Resize diagram
jascxx Nov 11, 2019
4934f02
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
jascxx Nov 11, 2019
3f39e21
Merge pull request #225 from AY1920S1-CS2103T-T11-2/jason-2-ppp
jascxx Nov 11, 2019
0b6efc0
Update DG, PPP language consistency
chrischenhui Nov 11, 2019
30b278e
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 11, 2019
0bf3073
Merge pull request #239 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
3238524
Italicise some words
chrischenhui Nov 11, 2019
a0178c6
Merge pull request #240 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
0932432
Small case png
sreesubbash Nov 11, 2019
c9c03da
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
sreesubbash Nov 11, 2019
ffbd3c2
PNG to png
sreesubbash Nov 11, 2019
3923bc5
UG formatting for .pdf
kohyida1997 Nov 11, 2019
db64b75
Merging with master
kohyida1997 Nov 11, 2019
5d60d13
Added page breaks to UG
kohyida1997 Nov 11, 2019
06d6457
Fixed EOF error
kohyida1997 Nov 11, 2019
9549254
Merge pull request #242 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 11, 2019
9cdd47d
Fix PPP Broken Link
kohyida1997 Nov 11, 2019
34241d2
Final UGDG formatting
kohyida1997 Nov 11, 2019
7d8a037
Italicise some words
chrischenhui Nov 11, 2019
08e1e24
Merge pull request #243 from AY1920S1-CS2103T-T11-2/yida-5-MoreDocs
kohyida1997 Nov 11, 2019
3d00242
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T11-2/ma…
chrischenhui Nov 11, 2019
43087d7
Remove ppp pdf
chrischenhui Nov 11, 2019
650967b
Merge pull request #244 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
4e6b4de
Add back PPP
chrischenhui Nov 11, 2019
be25fe3
Merge pull request #245 from AY1920S1-CS2103T-T11-2/chenhui-3-UGDG
chrischenhui Nov 11, 2019
1a5cd63
Fix PPP adoc and pdf
chrischenhui Nov 11, 2019
4aa6e68
Add new line
chrischenhui Nov 11, 2019
99d142d
Merge pull request #246 from AY1920S1-CS2103T-T11-2/chenhui-12-pppFix
chrischenhui Nov 11, 2019
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
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ language: java
matrix:
include:
- jdk: openjdk11
services:
- xvfb

before_script:
- export DISPLAY=:99.0

script: >-
./config/travis/run-checks.sh &&
Expand Down
22 changes: 12 additions & 10 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
= Address Book (Level 3)
= Dukemon
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://travis-ci.org/AY1920S1-CS2103T-T11-2/main[image:https://travis-ci.org/AY1920S1-CS2103T-T11-2/main.svg?branch=master[Build Status]]
https://coveralls.io/github/AY1920S1-CS2103T-T11-2/main?branch=master[image:https://coveralls.io/repos/AY1920S1-CS2103T-T11-2/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/manual/kohyida1997/main?utm_source=github.com&utm_medium=referral&utm_content=AY1920S1-CS2103T-T11-2/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/cd0b23e15b6a4fbca82036bdf5952fb1[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,20 +13,24 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* Dukemon is a desktop Flashcard style program designed to help YOU revise your work. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a program intended to help *troubled students* revise definitions and important keywords that they encounter in their studies.
* Subjects like Biology, Physics and Chemistry are especially compatible with our program. You will be able to create and save your own flashcards and datasets to test yourself.
* The flow of the program is simple - the question appears and you type in the matching answer.
* There are different game modes (Timed vs. Non-Timed, Hints vs. No-Hints) and difficulties that you can configure to challenge yourself.
* You will also be able to keep track of your statistics and progress.
* *SUPERCHARGE YOUR LEARNING NOW* and use *Dukemon* !

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* Adapted from source code of the AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
Expand Down
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import org.gradle.api.tasks.testing.logging.TestLogEvent


plugins {
id 'java'
id 'jacoco'
Expand Down Expand Up @@ -64,10 +65,15 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

testCompile "org.testfx:testfx-core:4.0.16-alpha"
testCompile "org.testfx:testfx-junit5:4.0.16-alpha"
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'

}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'Dukemon.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down
55 changes: 31 additions & 24 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,60 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
Dukemon was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team
== CS2103T-T11-2

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== James Pang
image::jamessspanggg.png[width="150", align="left"]
{empty}[http://github.com/jamessspanggg[homepage]] [https://github.com/jamessspanggg[github]] [<<jamessspanggg#, portfolio>>]

Role: Project Advisor
Role: Project Advisor + TA

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Chen Hui
image::chrischenhui.png[width="150", align="left"]
{empty}[http://github.com/chrischenhui[github]] [<<chrischenhui#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Responsibilities: UI + Game Logic

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Koh Yi Da
image::kohyida1997.png[width="150", align="left"]
{empty}[http://github.com/kohyida1997[github]] [<<kohyida1997#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Game + Timer + Threading

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Sree Subbash
image::sreesubbash.png[width="150", align="left"]
{empty}[http://github.com/sreesubbash[github]] [<<sreesubbash#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Dev Ops + Game Logic

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Jason Sathya Citro
image::jascxx.png[width="150", align="left"]
{empty}[http://github.com/jascxx[github]] [<<jascxx#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: UI + Data

'''

=== Paul Tho
image::dragontho.png[width="150", align="left"]
{empty}[http://github.com/dragontho[github]] [<<dragontho#, portfolio>>]

Role: Developer +
Responsibilities: UI + Data

'''
9 changes: 7 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-T11-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at +
oranged97@gmail.com +
kohyida1997@gmail.com +
sreesubbash@gmail.com +
jasonsathyacitro@gmail.com +
paultho97@gmail.com
Loading