207 Commits

Author SHA1 Message Date
Paul Gross
2ab87b04b2 Prise en compte des zones joueurs 2020-05-01 19:09:48 +02:00
AhmedSaad
861b66f439 tests supplementaires IA, revoir choix equipements 2020-05-01 09:53:35 +02:00
Paul Gross
51e4d845f0 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-30 19:10:48 +02:00
Paul Gross
ba5976ec93 Amélioration plateau 2020-04-30 19:10:41 +02:00
Bastien NOEL
11bf281ea3 ajout des effets sonores 2020-04-30 17:11:50 +02:00
Chiara
1bc6fd188d adaptation interfaces 2020-04-30 15:36:37 +02:00
Bastien NOEL
5a8f81c40f utf8 traduction 2020-04-30 14:54:55 +02:00
nawfe
99507e8d39 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-30 14:13:29 +02:00
nawfe
b7fdb22edc Traduction 2020-04-30 14:12:31 +02:00
nawfe
26f8971225 Merge conflict 2020-04-30 14:10:19 +02:00
Paul Gross
d476733172 Plateau.fxml 2020-04-30 14:00:09 +02:00
Paul Gross
6c9f24b1d7 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-30 13:58:00 +02:00
Paul Gross
12bf8f788e PlateauController et JoueurIHM 2020-04-30 13:57:53 +02:00
Chiara
fe10fc1c53 changement plateau 2020-04-30 13:54:54 +02:00
Chiara
660a38a0f5 changement plateau 2020-04-30 13:53:58 +02:00
Paul Gross
fa90f4b6d9 PlateauTest.fxml 2020-04-30 13:39:49 +02:00
nawfe
255e8012bf Traducion 2020-04-30 13:09:18 +02:00
Paul Gross
56a1177eaf Merge 2020-04-30 11:43:55 +02:00
Paul Gross
b6932c530e Factoriser PlateauController 2020-04-30 11:41:15 +02:00
Chiara
b293b3ed01 prise en compte des pions 2020-04-30 11:40:25 +02:00
AhmedSaad
8042514def fait enum contexte et changements a tester sur IA 2020-04-30 10:30:55 +02:00
JunkJumper
641d298bd3 Database script continue + tests Junit5 #4 2020-04-29 19:14:18 +02:00
Chiara
feee1885bd supression interfaces inutiles 2020-04-29 17:30:35 +02:00
Chiara
ab74bb0fdf lancement jouer tour auto plateau 2020-04-29 16:56:15 +02:00
nawfe
d4a52236e1 removed merge conflicts 2020-04-29 16:46:09 +02:00
nawfe
1c2426aad5 removed merge conflicts 2020-04-29 16:45:17 +02:00
Chiara
47a2be3252 changement plateau 2020-04-29 15:32:30 +02:00
Chiara
f8996e10ee changement plateau 2020-04-29 15:31:59 +02:00
JunkJumper
eea99d2341
Delete w.txt 2020-04-29 15:30:29 +02:00
JunkJumper
2a7002cdfb BDD jar API #4 2020-04-29 15:30:04 +02:00
JunkJumper
19d1e6cdd6 BDD TableGenerator #4 2020-04-29 15:18:48 +02:00
nawfe
7926ff0bae Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-29 15:00:10 +02:00
nawfe
d3cc6634fb removed merge conflicts 2020-04-29 15:00:04 +02:00
Paul Gross
e0e8278da7 Merge remote-tracking branch 'origin/rollingDice' into development 2020-04-29 12:23:27 +02:00
AhmedSaad
881c323481 petit truc sur IA 2020-04-29 11:37:27 +02:00
JunkJumper
7124e79df5 merge DB #4 2020-04-29 11:23:59 +02:00
JunkJumper
6edd8037b0 les script BDD avancent #4 2020-04-29 11:21:58 +02:00
Paul Gross
2c887d822e Scrolling area 2020-04-29 11:18:31 +02:00
AhmedSaad
60d2add18f certaines modif a JoueurVirtuel, tests a faire 2020-04-29 09:57:54 +02:00
nawfe
502a9fcc62 Traduction 2020-04-28 18:29:53 +02:00
nawfe
853534ce91 Traduction2 2020-04-28 16:11:30 +02:00
nawfe
09d2d520c3 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-28 15:36:07 +02:00
nawfe
159b34ab38 Traduction 2020-04-28 15:25:11 +02:00
Bastien NOEL
6fedf1c061 épuration du code 2020-04-28 14:49:47 +02:00
Bastien NOEL
9e57f0edd6 ajout de commentaires 2020-04-28 14:27:42 +02:00
Bastien NOEL
0a8c883595 bouton musique fonctionnel 2020-04-28 14:12:59 +02:00
Yessine Ben El Bey
77e1e2d7a8 Ajout de la musique paramètre non complet 2020-04-28 09:32:33 +02:00
nawfe
45f6e931ac Traduction 2020-04-27 18:15:24 +02:00
JunkJumper
cc6579816a Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 17:10:44 +02:00
JunkJumper
2f564f35b2 test db 2020-04-27 17:10:09 +02:00