58 Commits

Author SHA1 Message Date
nawfe
f619bcea3e Traduction fin 2020-05-15 16:14:42 +02:00
Kruss
90bb5a2cdd changements et reglé erreurs 2020-05-14 21:38:03 +02:00
Kruss
43fea99107 changements 2020-05-14 09:53:57 +02:00
Kruss
d858b1bcb9 prise en compte ia 2020-05-14 08:21:42 +02:00
Paul Gross
abacff2a17 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-08 16:09:01 +02:00
Paul Gross
d6fe0f0d80 Ajout des cartes lieux en provenance de la bdd 2020-05-08 16:08:56 +02:00
Yessine-iut
5e1ee06436 Suppression responsive 2020-05-08 14:10:12 +02:00
Yessine Ben El Bey
caf0e8db7c Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-07 17:11:26 +02:00
Yessine Ben El Bey
ff4f0aaab1 Responsive 2020-05-07 17:11:08 +02:00
Paul Gross
144ffd5434 Ajout constructeur de Plateau en s'appuyant de RessourceLoader 2020-05-07 16:58:31 +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
Bastien NOEL
96883dad89 ajout des regles du jeu 2020-05-06 14:37:59 +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
d7753d5182 adaptation interfaces boolean 2020-05-05 14:20:18 +02:00
Chiara
8e348d5a3e liasons interface joué tour 2020-05-05 13:13:25 +02:00
Kruss
745e8597ae changements pour executable x2 2020-05-04 14:41:30 +02:00
Kruss
e0b60aff40 changement de chemins pour executable 2020-05-04 13:57:50 +02:00
Paul Gross
2ab87b04b2 Prise en compte des zones joueurs 2020-05-01 19:09:48 +02:00
Bastien NOEL
5a8f81c40f utf8 traduction 2020-04-30 14:54:55 +02:00
nawfe
255e8012bf Traducion 2020-04-30 13:09:18 +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
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
Paul Gross
2c887d822e Scrolling area 2020-04-29 11:18:31 +02:00
nawfe
853534ce91 Traduction2 2020-04-28 16:11:30 +02:00
Bastien NOEL
6fedf1c061 épuration du code 2020-04-28 14:49:47 +02:00
Yessine Ben El Bey
36dff30b84 Ecran parametre 2020-04-27 17:09:53 +02:00
Chiara
8c55091fb2 changement des 2020-04-27 16:53:32 +02:00
nawfe
ec56b68cdf Traduction 2020-04-27 16:02:04 +02:00
Bastien NOEL
aa73c3c6ea correction des boutons de choix des joueurs 2020-04-27 14:32:50 +02:00
Chiara
5ccf1a731b changement des 2020-04-27 13:56:34 +02:00
Chiara
5d97ac65b8 poeut 2020-04-27 11:43:08 +02:00
Paul Gross
94e6c00001 Lancer de dés, nouvelle disposition IHM etc... 2020-04-27 11:40:14 +02:00
JunkJumper
3b590540ac restore commit ok 2020-04-24 18:18:48 +02:00
nawfe
c7ca4ec822 Traduction 2020-04-24 16:35:59 +02:00
Bastien NOEL
60764f7bba ajout d'une musique 2020-04-24 14:26:21 +02:00
Bastien NOEL
249c941962 ajout d'une musique 2020-04-24 14:21:26 +02:00
Bastien NOEL
628e14095e ajout d'une musique 2020-04-24 14:19:30 +02:00
Bastien NOEL
cd9de06a76 ajout d'une musique de fond 2020-04-24 14:14:46 +02:00
Chiara
962e4e4abd nom par defaut ia et grisement bouton si <4 2020-04-24 11:52:19 +02:00
Paul Gross
3803becdcf Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-24 10:09:39 +02:00
Paul Gross
51b6e80e45 Demo Rey 2020-04-24 10:09:30 +02:00
Chiara
c1751ce394 interfaces jouer tour 2020-04-23 15:36:36 +02:00
Chiara
d368228aab responsive 2020-04-23 13:47:40 +02:00