263 Commits

Author SHA1 Message Date
Paul Gross
4734e9bb7d Merging 2020-05-06 16:17:26 +02:00
Paul Gross
24cc4909bf Changement des classes types par des enum 2020-05-06 16:15:36 +02:00
Chiara
67d955b6d8 controller carte vision 2020-05-06 16:00:14 +02:00
JunkJumper
4843f9932e BDD formatage script 90% #4 2020-05-06 15:40:34 +02:00
Chiara
7d331ee7da correction merge main 2020-05-06 15:33:23 +02:00
Chiara
2edaa6156e revert stash 2020-05-06 15:32:07 +02:00
Chiara
e7ca21a33e revert stash 2020-05-06 15:31:27 +02:00
Chiara
34e3690ba9 controller piocher et lancer des 2020-05-06 15:24:39 +02:00
JunkJumper
13ae661b3b Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 15:11:02 +02:00
JunkJumper
2a730c2c1a readme 2020-05-06 15:10:48 +02:00
Paul Gross
1b554ad75c Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 14:40:24 +02:00
Paul Gross
9885ed12ca Retrieving cards 2020-05-06 14:39:43 +02:00
Bastien NOEL
96883dad89 ajout des regles du jeu 2020-05-06 14:37:59 +02:00
Yessine Ben El Bey
71b7a1cb2b Boutton quitter 2020-05-06 14:07:51 +02:00
JunkJumper
70a214248d Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 13:27:04 +02:00
JunkJumper
be7f6076f9 querry readAllBytes OK String to void #4 2020-05-06 13:26:53 +02:00
Paul Gross
ce713d07e1 minor change 2020-05-06 13:25:49 +02:00
Paul Gross
e13135d180 minor change 2020-05-06 13:25:08 +02:00
JunkJumper
975cedb690 querry readAllBytes OK #4 2020-05-06 13:24:50 +02:00
JunkJumper
36991016ba Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 13:22:09 +02:00
JunkJumper
ff73b605a6 querry readAllBytes OK #4 2020-05-06 13:21:16 +02:00
Bastien NOEL
173b9d6de0 ajout d'un bouton parametre dans le menu 2020-05-06 12:47:56 +02:00
Bastien NOEL
5ca48d7f19 musique fonctionnel dans le menu pause 2020-05-06 12:19:24 +02:00
Paul Gross
1a2b50ffb2 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 12:04:35 +02:00
Paul Gross
e91b24c13a Images + ajout des cartes visions et ténèbres 2020-05-06 12:04:30 +02:00
Kruss
624e12135f mise au point des tests IA 2020-05-06 10:03:37 +02:00
Chiara
17f5d37c5e generalisation lancer des, choisir joueur, choisir equipement 2020-05-05 15:38:11 +02:00
Paul Gross
2ab9df30ed Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-05 15:29:02 +02:00
Paul Gross
f8be85ad5e Création des cartes lumières pour insertion dans la bdd 2020-05-05 15:28:51 +02:00
Chiara
e5a28a1a4d création classe pour choix joueur 2020-05-05 14:49:38 +02:00
Chiara
901f872e3e adaptation interfaces boolean 2020-05-05 14:21:34 +02:00
Chiara
d7753d5182 adaptation interfaces boolean 2020-05-05 14:20:18 +02:00
JunkJumper
aeb17ba303 nouvelle BDD #4 2020-05-05 14:16:37 +02:00
Paul Gross
8952512b3e TestAddingCard 2020-05-05 13:53:54 +02:00
Paul Gross
fea2ecba5a Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-05 13:13:44 +02:00
Paul Gross
ea4d4612ab Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-05 13:13:29 +02:00
Chiara
8e348d5a3e liasons interface joué tour 2020-05-05 13:13:25 +02:00
Paul Gross
222605628c Récupération objet bdd 2020-05-05 13:13:21 +02:00
JunkJumper
e1baaa02f8 db #4 2020-05-05 11:24:05 +02:00
Paul Gross
40ad1cb599 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-05 10:51:36 +02:00
Paul Gross
7f9d8bce5c Fin de partie 2020-05-05 10:51:27 +02:00
Chiara
63b12cbf9a modif barre de vie plateau 2020-05-05 10:50:49 +02:00
nawfe
628dc33bb2 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-04 19:45:53 +02:00
nawfe
f93f6b534e Traduction suite 2020-05-04 19:36:39 +02:00
Bastien NOEL
808712f6b6 correction des problèmes liés aux effets sonores dans le menu pause 2020-05-04 17:54:13 +02:00
Bastien NOEL
54e2ae4039 ajustement et ajout d'effets sonores 2020-05-04 16:15:01 +02:00
Chiara
8627870e86 ajout menu pause 2020-05-04 16:07:25 +02:00
Bastien NOEL
c94e1a46af effets sonores fonctionnels 2020-05-04 15:04:24 +02:00
Kruss
eb5aacc8ce changement des chemins pour executable 2020-05-04 14:49:12 +02:00
Kruss
98a43e0363 enlevé un truc de debugage 2020-05-04 14:42:37 +02:00