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 |
|
|
|
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 |
|
|
|
01d855435e
|
Improved Move Action
|
2021-11-05 17:33:42 +01:00 |
|
Valentin Valentin
|
a2270d5de0
|
Ajout de la classe Cell et GUI, début d'implémentation de certaines de leurs méthodes.
|
2021-11-05 15:42:06 +01:00 |
|
Katchan
|
a7775f9c2a
|
Optimize imports
|
2021-11-05 15:36:03 +01:00 |
|
Katchan
|
3ccc26592c
|
Add differents ComputerPlayer class + refactor calls
|
2021-11-05 15:35:25 +01:00 |
|
|
|
a2ebb5195c
|
Add players' classes (dps, tank and support)
|
2021-11-05 13:50:02 +01:00 |
|
Katchan
|
4ac571ad09
|
Optimize import
|
2021-10-28 23:23:10 +02:00 |
|
Katchan
|
8a35d22b58
|
Add basis Play test and Shot test
|
2021-10-28 23:21:53 +02:00 |
|
Katchan
|
2322462ab3
|
Add various changes on Pair toString, Firearm getter
|
2021-10-28 23:19:53 +02:00 |
|
Katchan
|
19e5f19b19
|
Add increment function
|
2021-10-28 23:18:31 +02:00 |
|
Katchan
|
785e28e6a9
|
Implement all action function
|
2021-10-28 23:17:12 +02:00 |
|
|
|
70439266e9
|
Fix encoding
|
2021-10-28 16:18:47 +02:00 |
|
|
|
5912b49356
|
Partially fix GridTest.java
|
2021-10-26 17:17:06 +02:00 |
|
|
|
3a31f8485d
|
Merge branch 'testplay'
# Conflicts:
# server/src/main/java/fr/lnl/game/server/games/Game.java
# server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java
# server/src/main/java/fr/lnl/game/server/games/action/DropMine.java
|
2021-10-26 17:08:38 +02:00 |
|
|
|
2e86f71e94
|
Improved argument parser and fix a bug with grid not initialize on new instance
|
2021-10-26 16:04:12 +02:00 |
|
|
|
ad9ac682bb
|
Create a view per player + improved arguments parser
|
2021-10-26 10:26:31 +02:00 |
|
|
|
4e2da3330a
|
Added very basic view support + reworked players' fields in Game.java and Grid.java
|
2021-10-23 19:15:08 +02:00 |
|
Katchan
|
f611509175
|
Add playtest methode and diverses attributes and methods. Refactor isPossible method
|
2021-10-22 13:03:14 +02:00 |
|
Valentin Valentin
|
d6f2217554
|
Finalisation des classes DeployShield, DropBomb et DropMine
|
2021-10-22 08:17:50 +02:00 |
|
|
|
ce39edaead
|
Added view files + refactored Tests
|
2021-10-21 20:43:16 +02:00 |
|
Katchan
|
cd166fa809
|
Add move doAction
|
2021-10-21 17:19:05 +02:00 |
|
|
|
f5ba25843c
|
Merge remote-tracking branch 'origin/master'
|
2021-10-21 17:14:31 +02:00 |
|
|
|
fb1c82ed58
|
refactored ClassPlayer from a class to an enum
|
2021-10-21 17:14:04 +02:00 |
|
valentinlucas
|
dcf09f6b3f
|
Modifications et ajouts de méthodes aux classes et interface (DeployShield,DropBomb,DropMine,DropObject,Nothing,Player)
|
2021-10-21 17:05:11 +02:00 |
|
|
|
f2e42c68bf
|
Add test
|
2021-10-21 16:47:41 +02:00 |
|
Katchan
|
d2ccedb814
|
Add Move isPossible and getValidPoint and refactor Grid attributes
|
2021-10-21 16:41:04 +02:00 |
|
