Commit Graph

101 Commits

Author SHA1 Message Date
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
2a8eac9ea2 Merge branch 'master' of https://github.com/quentinlegot/legot-neveu-lucas 2021-12-07 16:05:46 +01:00
221aa3faec fix ButtonListener.java 2021-12-07 16:05:09 +01:00
Valentin Lucas
b0be4e1f68 Merge remote-tracking branch 'origin/master' 2021-12-07 16:03:28 +01:00
Valentin Lucas
422b0a4962 Correction du numéro du joueur + factorisation de quelques méthodes de window 2021-12-07 16:03:02 +01:00
c07266a763
add dialog when game finish (#1) 2021-12-07 16:02:20 +01:00
Katchan
db2e2e1f7a Merge remote-tracking branch 'origin/master' 2021-12-07 15:56:03 +01:00
Katchan
ca756c6e01 Fix explosives bugs 2021-12-07 15:55:51 +01:00
Valentin Lucas
486d3a2e2a Modification de ButtonListener 2021-12-07 15:32:09 +01:00
Katchan
0e8a46421f Merge remote-tracking branch 'origin/master' 2021-12-07 15:31:28 +01:00
Katchan
f4c3b09078 Fix actions and display bugs 2021-12-07 15:31:18 +01:00
7c00cd474b Add System.in as standard input 2021-12-07 15:13:27 +01:00
19dceafb7d Major improvement of windows (in terms of cpu, disk and ram performances), move ClientEventHandler.java to listener package 2021-12-07 12:19:31 +01:00
Valentin Lucas
1defc451aa Modification de putStatePlayerPane(), showStatePlayer(),showMoveText() (Reste à corriger certaines choses) 2021-12-07 10:07:38 +01:00
Valentin Lucas
bb44efd9fc Ajout de ShowMoveText() et showStatePlayers (à modifier) 2021-12-06 16:03:24 +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
0a4e706e07 Fix images not loading 2021-12-03 15:30:38 +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
Valentin Lucas
0876b4c773 Ajouts d'images et quelques modification de cell et Gui 2021-12-02 19:56:37 +01:00
b6cc8f24f9 Fix terminal view + fix dialog incorrect computer id 2021-12-02 18:44:57 +01:00
623e6b5fb3 Merge remote-tracking branch 'origin/master' 2021-12-02 18:33:36 +01:00
4c7017ff97 FINALLY fix the game with Window (currently not work with terminal) 2021-12-02 18:33:18 +01:00
Valentin Lucas
572a20bcf7 Modification de Cell et GUI, Affichage réussie de la grille mais image pas encore affichée 2021-12-02 16:12:30 +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
Valentin Valentin
1b8f9a2b30 Modification de cell et ajout d'un main temporaire + ajout d'images 2021-11-30 18:18:08 +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
f73dfc8bb9 Fix client only launching app on terminal view 2021-11-29 18:22:21 +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
42b0c656f8 forgot to add module-info.java to last commit 2021-11-27 17:02:51 +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
e2bd1a8bf6 Improve Shot Action and shotActionTest 2021-11-18 10:58:46 +01:00
8ca2326c89 Added 1 test 2021-11-07 15:58:55 +01:00
cb4c020fe6 Improved actions consistency 2021-11-07 15:36:16 +01:00
4b5f9b719d Improved interaction with box 2021-11-07 15:15:27 +01:00