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

[W14-3] Battleship #46

Open
wants to merge 1,701 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1701 commits
Select commit Hold shift + click to select a range
78a748e
Update PPP for iwle
iwle Apr 15, 2019
a3671c8
Update erjillsison.adoc
erjillsison Apr 15, 2019
5c26ae3
Update coming in v2.0 preface in UG
erjillsison Apr 15, 2019
72022d3
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
dff8018
Update Map in UG to address "you"
erjillsison Apr 15, 2019
47c9936
Update Model diagram size in PPP
erjillsison Apr 15, 2019
ffa6174
Update relevant parts in PPP, UG, DG for iwle
iwle Apr 15, 2019
3beb5ef
Merge branch 'master' into documentation-1.4
erjillsison Apr 15, 2019
d173d20
Update PutShipCommand sequence diagram
iwle Apr 15, 2019
a03f382
Fix broken link in AboutUs.adoc
iwle Apr 15, 2019
6560cf1
Add manual testing instructions for Battle feature
s-tr Apr 15, 2019
bed7b22
Add user stories for Battle feature in 1.4
s-tr Apr 15, 2019
9208a35
Added Stats activity diagram
bos10 Apr 15, 2019
2e10ab2
Merge branch 'master' into StorageToMerge
bos10 Apr 15, 2019
7129767
Merge pull request #400 from CS2103-AY1819S2-W14-3/esther-docs-v1.4
s-tr Apr 15, 2019
3030494
Create MapTest.java
erjillsison Apr 15, 2019
066b075
Update randomised map image
erjillsison Apr 15, 2019
dc64701
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
1a12d7d
Remove unused imports
erjillsison Apr 15, 2019
020b52d
Update erjillsison.adoc
erjillsison Apr 15, 2019
947fc4f
Change background color of code blocks to a darker shade
erjillsison Apr 15, 2019
4670fff
Update LogicManager tests
erjillsison Apr 15, 2019
09ee3e3
Update LogicManagerTest.java
erjillsison Apr 15, 2019
6d159a4
Add ReadSequenceDiagram and introduced compareData method
bos10 Apr 15, 2019
f7f493f
Update CommandResultTest.java
erjillsison Apr 15, 2019
287cad3
Added use case diagram
bos10 Apr 15, 2019
cdf3e19
Update BattleshipParserTest.java
erjillsison Apr 15, 2019
02769e3
Remove unused import
erjillsison Apr 15, 2019
596583f
Merge pull request #401 from CS2103-AY1819S2-W14-3/map-1.4
erjillsison Apr 15, 2019
2aad00d
Update DeveloperGuide.adoc
erjillsison Apr 15, 2019
1847e2f
Merge branch 'master' into documentation-1.4
iwle Apr 15, 2019
e31bba9
Add additional tests
lucydotc Apr 15, 2019
a1947dd
Merge remote-tracking branch 'origin/enemyTests' into enemyTests
lucydotc Apr 15, 2019
308681a
Remove redundant comments
lucydotc Apr 15, 2019
d95a49a
Merge branch 'master' into enemyTests
lucydotc Apr 15, 2019
6853916
Merge pull request #375 from CS2103-AY1819S2-W14-3/enemyTests
iwle Apr 15, 2019
fa3e6d6
Add stub tests for UI
iwle Apr 15, 2019
8daf8ff
Update ListShipCommand sequence diagram
iwle Apr 15, 2019
2f9b058
Update image for PutShipCommand sequence diagram
iwle Apr 15, 2019
e29a256
Update PPP for iwle
iwle Apr 15, 2019
a7291ce
Update User Guide
bos10 Apr 15, 2019
6bfd487
Merge branch 'master' into StorageToMerge
bos10 Apr 15, 2019
0d84715
Update RepoSense phrasing in PPP (iwle)
iwle Apr 15, 2019
363fee4
Merge pull request #399 from CS2103-AY1819S2-W14-3/StorageToMerge
bos10 Apr 15, 2019
564cf16
Update DeveloperGuide.adoc
erjillsison Apr 15, 2019
52d3558
Update InitialiseMapCommandSequenceDiagram
erjillsison Apr 15, 2019
cbd5055
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
39f4a41
Update erjillsison.adoc
erjillsison Apr 15, 2019
fd8ea4e
Add getter methods to Enemy
lucydotc Apr 13, 2019
6f979a3
Fix Typo
lucydotc Apr 13, 2019
403b346
Add some default values to private attributes
lucydotc Apr 13, 2019
44a03c5
Add tests for public methods in Enemy:
lucydotc Apr 13, 2019
3e01477
Fix typo that gave wrong return value
lucydotc Apr 13, 2019
294c210
Fix test for prepEnemy()
lucydotc Apr 13, 2019
b456e1e
Fix checkstyle
lucydotc Apr 13, 2019
7b54227
Fix checkstyle
lucydotc Apr 13, 2019
8f4223d
Fix checkstyle
lucydotc Apr 13, 2019
d903a9d
Fix checkstyle
lucydotc Apr 13, 2019
ed17b56
Fix checkstyle
lucydotc Apr 13, 2019
91da05f
Add getter for enemy watchlist
lucydotc Apr 13, 2019
e8111c6
Add test for watchlist getter method
lucydotc Apr 13, 2019
a1b48c3
Add test for enemyShootAt
lucydotc Apr 13, 2019
adc44fb
Add method to populate Player map with all ships available to it.
lucydotc Apr 13, 2019
989ec60
Remove unnecessary import
lucydotc Apr 13, 2019
963f93b
Remove unnecessary import
lucydotc Apr 13, 2019
6d899be
Remove duplicate code
lucydotc Apr 13, 2019
a90e1ca
Increase number of testing calls for enemyShootAt
lucydotc Apr 13, 2019
7071fc0
Minor changes to StatsSequenceDiagram and SaveSequenceDiagram
bos10 Apr 15, 2019
bfa758d
Resized images and Fixed image not showing for StatsWinScreen
bos10 Apr 15, 2019
6462316
Fixed typo in SaveSequenceDiagram
bos10 Apr 15, 2019
2fe6865
Set placeholder for figures to be placed in DG
bos10 Apr 15, 2019
c0a00aa
Added Stats activity diagram
bos10 Apr 15, 2019
9c63fe5
Add ReadSequenceDiagram and introduced compareData method
bos10 Apr 15, 2019
7bd0fd2
Added use case diagram
bos10 Apr 15, 2019
6579d22
Add additional tests
lucydotc Apr 15, 2019
dc4281f
Remove redundant comments
lucydotc Apr 15, 2019
789a691
Update User Guide
bos10 Apr 15, 2019
4579b8d
Update User Guide 2.0
bos10 Apr 15, 2019
b676f22
Add tags for enemy in Developer guide
lucydotc Apr 15, 2019
da1a772
Fix trailing whitespace
erjillsison Apr 15, 2019
f6a5ced
Add tags for enemy in User guide
lucydotc Apr 15, 2019
e75ce0e
Write Lucy PPP
lucydotc Apr 15, 2019
f4199f9
Update word choice
bos10 Apr 15, 2019
e601021
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
938369f
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
f7b3ff9
Update DeveloperGuide.adoc
erjillsison Apr 15, 2019
382dbee
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
2c61047
Add stub tests for EnemyMap
iwle Apr 15, 2019
9f7b6d2
Add command alias for init
erjillsison Apr 15, 2019
ceb0bdd
Add code snippet
lucydotc Apr 15, 2019
fbb3298
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
dd52662
Update UserGuide.adoc
erjillsison Apr 15, 2019
b5a0a9d
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
79a1ffd
Update PPP code contributed
erjillsison Apr 15, 2019
2305e85
Update PPP code contributed
erjillsison Apr 15, 2019
e5ccb00
Update PPP
bos10 Apr 15, 2019
7b55121
Remove trailing whitespace
erjillsison Apr 15, 2019
56d5c48
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
4181273
Merge branch 'master' into documentation-1.4
bos10 Apr 15, 2019
730df96
Update InitialiseMapCommandSequenceDiagram
erjillsison Apr 15, 2019
bec478b
Change Game rules to second person
lucydotc Apr 15, 2019
3354286
Update PPP
bos10 Apr 15, 2019
633573b
Update Use Cases in DG
erjillsison Apr 15, 2019
28c183d
Update use case in PPP
erjillsison Apr 15, 2019
8bef7f2
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
2bf7e4d
Add labelling to Enemy AI pictures
lucydotc Apr 15, 2019
3e59a39
Add contributions to UG in PPP
lucydotc Apr 15, 2019
dc2cb8b
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
a2544a2
Minor edits to PPP
bos10 Apr 15, 2019
1c6c690
labelled figures
bos10 Apr 15, 2019
9c52acf
Merge branch 'master' into stub-tests-1.4
iwle Apr 15, 2019
876a4f8
Added travis codacy to readme
bos10 Apr 15, 2019
8e069a1
Resize pictures
bos10 Apr 15, 2019
eb898e6
Merge pull request #403 from CS2103-AY1819S2-W14-3/stub-tests-1.4
iwle Apr 15, 2019
ff167e9
Remove delay in BattleManager
s-tr Apr 15, 2019
5cb863f
Remove unneeded exception handler in BattleManager
s-tr Apr 15, 2019
ca4535b
Add new EvilEnemy that throws exception in enemyShootAt
s-tr Apr 15, 2019
c81c1ef
Add test for scenario where Enemy.enemyShootAt throws exception
s-tr Apr 15, 2019
e3b4dc4
Add test for Player.toString()
s-tr Apr 15, 2019
a7a0bec
Remove unused methods in Fleet
s-tr Apr 15, 2019
c9d3efd
Improve addResultToStats() method
s-tr Apr 15, 2019
883b160
Refactor StatisticsTest to use @Before methods
s-tr Apr 15, 2019
10d2c41
Add stub test for Statistics.generateData
s-tr Apr 15, 2019
fd50e5e
Add proper generic types
s-tr Apr 15, 2019
9e0b630
Remove logging from Coordinates
s-tr Apr 15, 2019
099f406
Add test for Fleet.FleetEntry.equals()
s-tr Apr 15, 2019
f18d1bf
Update PPP
erjillsison Apr 15, 2019
cde3c75
resizing tables
bos10 Apr 15, 2019
ed5019d
Add tests for StatisticView.show
s-tr Apr 15, 2019
9441ec8
Add ConfigTest
s-tr Apr 15, 2019
5d9d000
Add VersionTest
s-tr Apr 15, 2019
a57999f
Add private constructor for commons.util
s-tr Apr 15, 2019
5cbc96b
Remove BattleState.getDescription
s-tr Apr 15, 2019
5af7ea1
Add some tests for BattleshipParser
s-tr Apr 15, 2019
d0d8130
Add private constructor for CliSyntax and ParserUtil
s-tr Apr 15, 2019
7071ff6
Update PPP for iwle
iwle Apr 15, 2019
2baed93
Update UG, change tags in UG, update PPP for iwle
iwle Apr 15, 2019
afd4fc4
Update UG to add references to user, update PPP
iwle Apr 15, 2019
f36be07
Update 'Battleship' to 'Ship' in UG
iwle Apr 15, 2019
d316a86
Update 'Battleship' to 'Ship' in DG
iwle Apr 15, 2019
6e97c34
Merge branch 'master' into documentation-1.4
iwle Apr 15, 2019
4d7bc89
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
0e2f07c
Fix checkstyle
s-tr Apr 15, 2019
45e90ba
Merge pull request #404 from CS2103-AY1819S2-W14-3/esther-addtests-v1.4
s-tr Apr 15, 2019
fdbddcc
resize
bos10 Apr 15, 2019
503090d
resize again
bos10 Apr 15, 2019
d7a9fd7
Resize images in PPP for iwle
iwle Apr 15, 2019
d2998b2
Update minor error in filename in DG
iwle Apr 15, 2019
00fe45f
Update PPP
erjillsison Apr 15, 2019
c834f9c
Resize
bos10 Apr 15, 2019
3e94785
resize
bos10 Apr 15, 2019
4a87baa
final resize
bos10 Apr 15, 2019
b45a0f3
Reorder enemy shooting algo
lucydotc Apr 15, 2019
dc27db4
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
eeede79
Update high level sequence diagram in DG
erjillsison Apr 15, 2019
49abecd
Add jdocs for enemy class
lucydotc Apr 15, 2019
bbbee26
Add numbered headers in PPP for iwle
iwle Apr 15, 2019
d297ba3
Merge branch 'master' into documentation-1.4
erjillsison Apr 15, 2019
e3c46d9
Update PPP for iwle
iwle Apr 15, 2019
fd7a182
Add jdocs
lucydotc Apr 15, 2019
eafe6f2
Update PPP and UG for iwle
iwle Apr 15, 2019
7b462d4
Add jdocs
lucydotc Apr 15, 2019
1a97c21
Add use case diagram for Ship Management
iwle Apr 15, 2019
47e1014
Add jdocs
lucydotc Apr 15, 2019
ad96d9d
Merge branch 'master' into map-1.4
lucydotc Apr 15, 2019
53f9959
Removed command summary table, replaced with link instead
bos10 Apr 15, 2019
9f93b52
Add jdocs
lucydotc Apr 15, 2019
a031f23
resize
bos10 Apr 15, 2019
4e588c4
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
894570f
Merge pull request #405 from CS2103-AY1819S2-W14-3/enemyJavaDocs
lucydotc Apr 15, 2019
5e9c5f8
Merge branch 'master' into map-1.4
lucydotc Apr 15, 2019
7908044
resize
bos10 Apr 15, 2019
acdf394
Rename my PPP
lucydotc Apr 15, 2019
581cb26
Merge pull request #402 from CS2103-AY1819S2-W14-3/map-1.4
lucydotc Apr 15, 2019
97ea461
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
a052df5
Rename PPP link in About us
lucydotc Apr 15, 2019
beaced8
Fix typo
erjillsison Apr 15, 2019
8f73398
Resize
bos10 Apr 15, 2019
72b8b06
Merge branch 'master' into documentation-1.4
lucydotc Apr 15, 2019
fd693ac
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
77aa3bd
Update PPP for iwle
iwle Apr 15, 2019
247fe9d
resize
bos10 Apr 15, 2019
e163389
Delete PlaceMultipleDestroyerAndCruiserSequenceDiagram.png
lucydotc Apr 15, 2019
ddef6c7
Add files via upload
lucydotc Apr 15, 2019
1a1f5e7
Add files via upload
lucydotc Apr 15, 2019
bdc9fdc
Add files via upload
lucydotc Apr 15, 2019
91d0dd2
Delete placeMultipleDestroyerAndCruiser_1.png
lucydotc Apr 15, 2019
b6598ca
Add files via upload
lucydotc Apr 15, 2019
6736ec1
last resize for ppp
bos10 Apr 15, 2019
16746c6
Added trailing fullstop
bos10 Apr 15, 2019
f49f1eb
Fix typo in PPP
erjillsison Apr 15, 2019
d451165
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
545bb2d
Edit word choice in UG
bos10 Apr 15, 2019
69f1c7c
Remove FAQ
bos10 Apr 15, 2019
63828b6
Update all arrows in sequence diagrams to point well
iwle Apr 15, 2019
bd7ac36
Add Use Case for Battle component to DG
s-tr Apr 15, 2019
9444279
Make small changes to Esther's PPP
s-tr Apr 15, 2019
54756e3
Add commit information to PPP
s-tr Apr 15, 2019
1dfbc07
Change the TOC numbering levels for DG
s-tr Apr 15, 2019
d4b6c6b
Make DG headers have same part of speech
s-tr Apr 15, 2019
f691dfd
Revise the sections of DG that will go in Esther's PPP
s-tr Apr 15, 2019
566b31f
Change the section of Battle Component that will be included in the PPP
s-tr Apr 15, 2019
b4e81c6
Update Esther's PPP
s-tr Apr 15, 2019
243e240
Update caption for 'How the architecture components interact with eac…
s-tr Apr 15, 2019
c516553
Update user in use case diagram
iwle Apr 15, 2019
57c7e47
Merge pull request #406 from CS2103-AY1819S2-W14-3/esther-docs-v1.4
s-tr Apr 15, 2019
5c3d6df
Fix formatting in Fleet.java
iwle Apr 15, 2019
3480528
Update code snippet boundaries
lucydotc Apr 15, 2019
902a722
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
5bfb8b2
Update ListShipCommand sequence diagram
iwle Apr 15, 2019
f217db8
Edited listTagSequenceDiagram lines not touching
bos10 Apr 15, 2019
c546649
Fix headers for Enemy AI
lucydotc Apr 15, 2019
c351f23
Update AboutUs typo
iwle Apr 15, 2019
7dc7219
Fix headers for design consideration
lucydotc Apr 15, 2019
44e4788
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
b444dfc
Make diagrams bigger
bos10 Apr 15, 2019
bc4ac62
fix code snippet
lucydotc Apr 15, 2019
346ea4a
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
d8abce0
Final resize
bos10 Apr 15, 2019
e09d1fe
Remove stray character
lucydotc Apr 15, 2019
d37b762
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
c499bc5
Update images for sequence diagram
iwle Apr 15, 2019
2ddebd7
Update typos in PPP for iwle
iwle Apr 15, 2019
d5dbf97
Remove stray character
lucydotc Apr 15, 2019
5b24cee
Finalise Esther's PPP
s-tr Apr 15, 2019
671e159
Add new lines
lucydotc Apr 15, 2019
2197893
Merge remote-tracking branch 'origin/documentation-1.4' into document…
lucydotc Apr 15, 2019
5ac049f
Merge pull request #408 from CS2103-AY1819S2-W14-3/esther-docs-v1.4
s-tr Apr 15, 2019
6d3ba15
Change all commands to be case-insensitive
erjillsison Apr 15, 2019
39e421a
Update ListShip sequence diagram
iwle Apr 15, 2019
c424919
Update image again
iwle Apr 15, 2019
5ec7e99
Merge pull request #409 from CS2103-AY1819S2-W14-3/map-1.4
erjillsison Apr 15, 2019
362d509
Merge branch 'master' into documentation-1.4
erjillsison Apr 15, 2019
1dffa44
Add MSS to iwle PPP
iwle Apr 15, 2019
d4598df
Update README.adoc
iwle Apr 15, 2019
61327d9
Update UG
iwle Apr 15, 2019
1359741
Update DG, change to "initialise the map"
iwle Apr 15, 2019
c6f7135
Update UG, "depending on your map size"
iwle Apr 15, 2019
8088c8a
Update PutShip command in UG
iwle Apr 15, 2019
2242f57
Final changes to UG/DG
s-tr Apr 15, 2019
835d77a
Merge pull request #410 from CS2103-AY1819S2-W14-3/esther-docs-v1.4
s-tr Apr 15, 2019
b66a4e0
Remove trailing whitespace
erjillsison Apr 15, 2019
d1609c9
Merge branch 'documentation-1.4' of https://github.com/CS2103-AY1819S…
erjillsison Apr 15, 2019
45e8350
Merge pull request #396 from CS2103-AY1819S2-W14-3/documentation-1.4
s-tr Apr 15, 2019
6e55c30
Rework the package structure of the Battle component
s-tr Apr 14, 2019
11eb3f8
Fix broken imports
s-tr Apr 15, 2019
379ca42
Fix checkstyle violations
s-tr Apr 15, 2019
a3f14f2
Fix checkstyle violations in test code
s-tr Apr 15, 2019
3c17d09
Merge pull request #407 from CS2103-AY1819S2-W14-3/esther-battle-v1.4
s-tr Apr 15, 2019
c22d41c
Delete s-tr.png
s-tr May 3, 2021
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
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ classes/
/bin/
src/main/resources/docs/
out/
.backup/
docs/diagrams/.~lock*
29 changes: 16 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
= Address Book (Level 4)
= Battleship
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://travis-ci.org/CS2103-AY1819S2-W14-3/main[image:https://travis-ci.org/CS2103-AY1819S2-W14-3/main.svg?branch=master[Build Status]]
https://github.com/CS2103-AY1819S2-W14-3/main[image:https://travis-ci.org/CS2103-AY1819S2-W14-3/main.svg?branch=master[Build Status]]
https://coveralls.io/github/CS2103-AY1819S2-W14-3/main[image:https://coveralls.io/repos/github/CS2103-AY1819S2-W14-3/main/badge.svg?branch=master[Coverage Status]]


ifdef::sdsdds[]

https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
endif::[]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,26 +20,23 @@ 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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop Battleship application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* One can play the classic Battleship game against the computer on this app.
* This application is designed for people who want to play Battleship but prefer to use the command-line or are otherwise unable to operate a GUI.
** This project is written in an OOP style.
** This project supports _Build Automation_ using Gradle and _Continuous Integration_ using Travis CI.

== Site Map

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

== Acknowledgements

* 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_.
* This application is a fork of https://github.com/nus-cs2103-AY1819S2/[addressbook-level4] by
the se-edu team.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
30 changes: 30 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"authors":
[
{
"githubId": "bos10",
"displayName": "CHE...TON",
"authorNames": ["bos10"]
},
{
"githubId": "s-tr",
"displayName": "CHO...WEI",
"authorNames": ["s-tr"]
},
{
"githubId": "iwle",
"displayName": "IAN... EN",
"authorNames": ["iwle", "Ian Wu", "[email protected]"]
},
{
"githubId": "lucydotc",
"displayName": "LUC...YAN",
"authorNames": ["lucydotc"]
},
{
"githubId": "erjillsison",
"displayName": "SIS...NES",
"authorNames": ["erjillsison"]
}
]
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -202,8 +202,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-name': 'Battleship',
'site-githuburl': 'https://github.com/CS2103-AY1819S2-W14-3/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
48 changes: 24 additions & 24 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 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} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
Battleship was developed by Team W14-G3. We are a team from Singapore developing retro games for the world. +

We are based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== 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>>]
=== Boston Cheong
image::bos10.png[width="150", align="left"]
{empty}[https://github.com/bos10[github]] [<<bos10#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibility: Statistics management feature

'''

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

Role: Team Lead +
Responsibilities: UI
Responsibilities: Map management feature

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Esther Chong
image::s-tr.png[width="150", align="left"]
{empty}[http://github.com/s-tr[github]] [<<s-tr#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Battle management feature

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Ship management feature

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Computer Enemy management feature

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/CS2103-AY1819S2-W14-3/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 `battleshipdevelopers [at] gmail.com`
Loading