quentinlegot/turn-based-strategy-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
118 Commits 3 Branches 0 Tags 1.3 MiB
66cdda1304
Commit Graph

118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quentin Legot
66cdda1304
Merge pull request #2 from quentinlegot/conflit-2 
updated javadoc syntax in some places, add javadoc to game.player and…
 2021-12-08 19:11:45 +01:00
Quentin Legot
3e2252a5ad
Merge branch 'master' into conflit-2 2021-12-08 19:11:18 +01:00
Quentin Legot
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
Quentin Legot
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
Quentin Legot
ea07ca0c6a add comments to Grid package, delete arguments to GridFacotryBuilder's methods where it's unnecessary 2021-12-08 17:18:11 +01:00
Quentin Legot
03be6c2a78 add javadoc to actions, delete gradle.properties 2021-12-08 16:08:33 +01:00
Quentin Legot
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
Quentin Legot
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
Quentin Legot
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
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
Quentin Legot
bf37f32407 Reworked GridStrategy and renamed it to GridFactoryBuilder 2021-12-07 18:10:18 +01:00
Quentin Legot
cacf5ee8c3 fix tests 2021-12-07 17:37:32 +01:00
Quentin Legot
2a8eac9ea2 Merge branch 'master' of https://github.com/quentinlegot/legot-neveu-lucas 2021-12-07 16:05:46 +01:00
Quentin Legot
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
Quentin Legot
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
Quentin Legot
7c00cd474b Add System.in as standard input 2021-12-07 15:13:27 +01:00
Quentin Legot
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
Quentin Legot
e7740739d9 Add support to grid elements using a countdown like bomb 2021-12-06 13:02:55 +01:00
Quentin Legot
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
Quentin Legot
0a4e706e07 Fix images not loading 2021-12-03 15:30:38 +01:00
Quentin Legot
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
Quentin Legot
b6cc8f24f9 Fix terminal view + fix dialog incorrect computer id 2021-12-02 18:44:57 +01:00