Commit Graph

69 Commits

Author SHA1 Message Date
fb408a3f78 update javadoc from package client.view 2021-12-09 16:07:03 +01:00
4caa131a4c add javadoc to client.view 2021-12-09 15:39:45 +01:00
94cd0bb030 Add javadoc to client package (no subpackage) 2021-12-09 14:48:27 +01:00
Katchan
4062f43c40 Merge remote-tracking branch 'origin/master' 2021-12-09 14:19:37 +01:00
Katchan
491f537cae Improve Window view 2021-12-09 14:19:08 +01:00
4098e01630 move playersList from App to ViewManager 2021-12-09 14:18:44 +01:00
5beaeacc1e fix special character not showing correctly in javafx on windows 2021-12-09 13:07:59 +01:00
aacbd65b56
Merge branch 'master' into conflit-3 2021-12-09 12:51:10 +01:00
71f87a3f1c Added buttons when player is human 2021-12-09 12:47:41 +01:00
Katchan
17e63aa826 Add stage icon 2021-12-09 12:46:40 +01:00
Katchan
2670acc775 Improve window view 2021-12-09 12:39:12 +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
f7b6f32ae2 add javadoc to Game.java, delete InterfaceAction (was useless), improved grid factory calls consistency 2021-12-08 21:18:55 +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
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
Valentin Lucas
6e13a3124e Correction de quelques propriétés de Cell et modification de Window 2021-12-08 09:12:45 +01:00
Katchan
2e5fcd2a05 Add human terminal choseAction 2021-12-07 21:38:59 +01:00
bf37f32407 Reworked GridStrategy and renamed it to GridFactoryBuilder 2021-12-07 18:10:18 +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
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
7dde04303c Move images, optimize imports, move GUI instructions to Window.java 2021-12-04 16:13:22 +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
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
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