Commit Graph

97 Commits

Author SHA1 Message Date
94cd0bb030 Add javadoc to client package (no subpackage) 2021-12-09 14:48:27 +01:00
71f87a3f1c Added buttons when player is human 2021-12-09 12:47:41 +01:00
9771d397a8 add javadoc to server.utils and server.listener 2021-12-08 22:52:09 +01:00
Katchan
eaec044950 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	server/src/main/java/fr/lnl/game/server/games/Game.java
2021-12-08 21:50:00 +01:00
Katchan
dab710597b Improve display in terminal view and add Shot icon in Window view 2021-12-08 21:47:34 +01:00
Katchan
417d311435 Improve StrategyComputerPlayer 2021-12-08 21:46:37 +01:00
f7b6f32ae2 add javadoc to Game.java, delete InterfaceAction (was useless), improved grid factory calls consistency 2021-12-08 21:18:55 +01:00
3e2252a5ad
Merge branch 'master' into conflit-2 2021-12-08 19:11:18 +01:00
848fccbefd updated javadoc syntax in some places, add javadoc to game.player and game.weapon 2021-12-08 19:09:58 +01:00
Katchan
37d03e570a Add basis strategy on StrategyComputerPlayer and implementation on this player in the game, view. 2021-12-08 18:56:26 +01:00
Katchan
4c52bedc9f Improve display of classes in the view, add player shield icon 2021-12-08 18:54:52 +01:00
Katchan
2e99366e56 Add utils functions 2021-12-08 18:52:12 +01:00
8415739d18 add javadoc to grid's elements, deleted useless x and y parameters in Wall, adjustments to bombs timer and explosion size 2021-12-08 18:43:34 +01:00
ea07ca0c6a add comments to Grid package, delete arguments to GridFacotryBuilder's methods where it's unnecessary 2021-12-08 17:18:11 +01:00
03be6c2a78 add javadoc to actions, delete gradle.properties 2021-12-08 16:08:33 +01:00
938eefe387 Improve CrashException handler, fix java encoding, updated junit dependencies, add private methods to javadoc, renamed Error to ErrorMessage 2021-12-08 15:00:13 +01:00
Katchan
4305f8963b Add private view 2021-12-08 12:52:25 +01:00
609966d9af Rework ChoseAction when currentPlayer is Human(now respect M-VC(terminal) model), but not implemented with Window 2021-12-08 11:58:40 +01:00
74b8489854 fix NullPointerException error when using Terminal view, fix MVC model not respected to display winner 2021-12-08 11:32:16 +01:00
Katchan
2e5fcd2a05 Add human terminal choseAction 2021-12-07 21:38:59 +01:00
Katchan
a6b9b69d9b Fix player who stayed on the grid 2021-12-07 21:38:43 +01:00
Katchan
4958c7688e Add useful functions and class 2021-12-07 21:37:16 +01:00
bf37f32407 Reworked GridStrategy and renamed it to GridFactoryBuilder 2021-12-07 18:10:18 +01:00
cacf5ee8c3 fix tests 2021-12-07 17:37:32 +01:00
c07266a763
add dialog when game finish (#1) 2021-12-07 16:02:20 +01:00
Katchan
ca756c6e01 Fix explosives bugs 2021-12-07 15:55:51 +01:00
Katchan
f4c3b09078 Fix actions and display bugs 2021-12-07 15:31:18 +01:00
e7740739d9 Add support to grid elements using a countdown like bomb 2021-12-06 13:02:55 +01:00
7dde04303c Move images, optimize imports, move GUI instructions to Window.java 2021-12-04 16:13:22 +01:00
Katchan
aea8ac654d Fix build function call 2021-12-04 15:36:47 +01:00
Katchan
87d4b6ca39 Fix Git add files 2021-12-04 15:20:12 +01:00
Katchan
f4477ac1e0 Add buildGrid Strategy Pattern 2021-12-04 15:17:41 +01:00
Katchan
daa07887f7 Deletion of the notion of cardinal for a wall 2021-12-03 15:45:09 +01:00
899f3ecebf Merge remote-tracking branch 'origin/master' 2021-12-03 15:25:13 +01:00
Katchan
3066ecf211 Fix critical bug 2021-12-03 15:22:00 +01:00
Katchan
7afd79b929 Conflict resolution 2021-12-02 20:11:23 +01:00
Katchan
e862e79a62 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	client/src/main/java/fr/lnl/game/client/App.java
#	server/src/main/java/fr/lnl/game/server/games/Game.java
#	server/src/test/java/fr/lnl/game/server/Mock.java
2021-12-02 20:06:53 +01:00
Katchan
a354d4fb21 Mock update and import optimization 2021-12-02 20:03:46 +01:00
Katchan
5201e73772 Add AbstractBox and lock case notion (to see if it is viable to keep it) 2021-12-02 20:01:49 +01:00
Katchan
c6f4dbffe3 Add random choose method in the Cardinal enum 2021-12-02 20:00:53 +01:00
Katchan
d40dedfc17 Add placement rules for walls, energyballs and players 2021-12-02 19:59:53 +01:00
b6cc8f24f9 Fix terminal view + fix dialog incorrect computer id 2021-12-02 18:44:57 +01:00
4c7017ff97 FINALLY fix the game with Window (currently not work with terminal) 2021-12-02 18:33:18 +01:00
2ebd51f011 Move viewUpdate to ViewManager.java, renamed getPoint() to getPosition() in Player, View still not work 2021-12-01 23:31:51 +01:00
de8c258322 Fix game not launching + add supprot to Computer Players (AI) + fix view not updating at each Game#play 's loop 2021-11-29 19:22:43 +01:00
b08139ebca Fix NullPointerException in App.java 2021-11-27 19:20:27 +01:00
9cfa56be8d implement Game#play 2021-11-27 17:47:05 +01:00
21e571027f Move and updated listeners 2021-11-27 17:01:25 +01:00
b702a4030f Reworked dropBomb and DropMine + reordered tests 2021-11-26 16:04:27 +01:00
360a84c403 Fix ArrayOutOfBoundException when we didn't have a winner 2021-11-18 11:06:53 +01:00