Commit Graph

29 Commits

Author SHA1 Message Date
122200a391 add chooseMove support for windows ( crosses doesn't display correctly ) 2021-04-29 19:34:51 +02:00
Eideen
abc02f94e7 Use arrow for ship placement 2021-04-29 11:41:43 +02:00
725a7b25d9 Implemented keyboard 2021-04-27 16:33:21 +02:00
3d11240037 Improve mouse support (untested) 2021-04-27 14:50:47 +02:00
43ab7ebfa7 Refactored and optimized project + bugs fix 2021-04-10 15:05:02 +02:00
0546fa73bc Improved MVC model 2021-04-10 12:42:15 +02:00
dfe1c2ff72 Fix NullPointerException when using Window view + improve lisibility + fix Triplet.equals + add View.displayWinner 2021-04-07 16:47:59 +02:00
28a1702bfd Merge remote-tracking branch 'origin/master' 2021-04-07 15:32:09 +02:00
f792e2ba7b Fix Pair.equals & Player.setShips 2021-04-07 15:31:57 +02:00
Antonin Boyon
0024b55208 merging 2021-04-06 12:25:46 +02:00
Antonin Boyon
d0a517efe3 starting the GUI - grid 2021-04-06 12:22:46 +02:00
3919fcfea8 Fix toString not displaying ships (but need debugging) 2021-04-06 11:41:11 +02:00
eddd1940f8 delete Add View.placeShipRandomly (already in Player.java) 2021-04-06 10:36:47 +02:00
Antonin Boyon
1fc316b132 moving placeShip to Player 2021-04-06 10:31:54 +02:00
7fc9fb462c Improved View.toString 2021-04-06 10:19:56 +02:00
f2607f1268 Add View.placeShipRandomly 2021-04-06 09:55:02 +02:00
Arthur7770
db65bedbaa Comment the first lines of game.play() and remove the useless scanner 2021-03-30 10:09:31 +02:00
13a48c9d4b Move setShips from Game to View + fix Direction.java + improved Player.setShips to check if there is no boat at the location where we want to place another 2021-03-28 15:09:44 +02:00
19bd363503 Add Direction enum + fix Game.setShips(Player) 2021-03-28 14:35:10 +02:00
Arthur
be296d3946 There is an error in Game.java line 95, I don't understand why the program skip the scanner.nextLine 2021-03-28 13:55:59 +02:00
Arthur
c45d8a93ae Adding some modifications + please if you find ho to fix Terminal.java toString() method, do it 2021-03-27 19:43:36 +01:00
1ffc7ded74 Fix Random.nextInt(int) in Random.java 2021-03-27 15:05:01 +01:00
Arthur
de37c534c0 Adding a few changes 2021-03-27 14:56:01 +01:00
Arthur
33ab1c131a Adding getters to Ship.class, Adding a checker in Game.class and Starting the toString() method of View.class 2021-03-27 13:12:33 +01:00
8524f83864 Add Main.java, View.java, Window.java, Terminal.java and Game.java 2021-03-27 11:12:20 +01:00
Arthur
609b2b821a Remove USELESS class Battleship 2021-03-23 10:57:35 +01:00
48ba657ef1 Add Ship.java, Pair.java, fix Player.java, add ArrayList of ships in Battleship.java 2021-03-23 10:37:51 +01:00
Arthur
2eb488f14a Adding player 2021-03-23 10:27:30 +01:00
1baedaf6e7 Added Triplet.java and Battleship.java 2021-03-23 10:09:43 +01:00