Commit Graph

294 Commits

Author SHA1 Message Date
3e88a7d1a7 bdd vrai #4 2020-05-08 17:00:32 +02:00
ff66ba807a bdd 2020-05-08 16:52:08 +02:00
02a15030bb Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-08 16:44:12 +02:00
0367d64882 BDD 2020-05-08 16:44:03 +02:00
1b69f11ce7 Changement de langue 2020-05-08 16:32:00 +02:00
5ac8589818 ajout de slider pour regler le volume des effets sonores dans les parametres et le menu pause 2020-05-08 16:18:56 +02:00
abacff2a17 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-08 16:09:01 +02:00
d6fe0f0d80 Ajout des cartes lieux en provenance de la bdd 2020-05-08 16:08:56 +02:00
5e1ee06436 Suppression responsive 2020-05-08 14:10:12 +02:00
3e13aefcce Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-07 18:09:12 +02:00
a6a8b326d9 Parametre 2020-05-07 18:08:54 +02:00
78f251d5f1 ajout du slider dans le menu pause pour la musique 2020-05-07 18:01:04 +02:00
ffa5398c4f ajout slider parametre pour la musique 2020-05-07 17:19:46 +02:00
caf0e8db7c Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-07 17:11:26 +02:00
ff4f0aaab1 Responsive 2020-05-07 17:11:08 +02:00
892dd6da73 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development v0.1 2020-05-07 16:58:36 +02:00
144ffd5434 Ajout constructeur de Plateau en s'appuyant de RessourceLoader 2020-05-07 16:58:31 +02:00
a2bc3f1dd4 Paramètre mettre les cases cochés et controllerPause mettre les cases cochés 2020-05-07 14:46:01 +02:00
6f6c2af608 changements pour executable 2020-05-07 14:05:14 +02:00
a3ae506ee7 Fix pauseController 2020-05-07 11:32:33 +02:00
77166d9180 Bouton retour choix joueur 2020-05-07 11:30:31 +02:00
ce4a6bfeac Bouton retour joueur 2020-05-07 11:28:01 +02:00
9fca28f7bb Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 17:50:12 +02:00
14bcbe0347 Ressource loader fonctionnel 2020-05-06 17:49:55 +02:00
7d2ae20c6d correction d'une erreur avec le menu pause 2020-05-06 17:21:43 +02:00
fb161fec2c réglage du volume de la musique dans les paramètre et le menu pause 2020-05-06 17:10:07 +02:00
3e0d0e7efb RessourceLoader 2020-05-06 16:47:22 +02:00
35f87bd62e RessourceLoader 2020-05-06 16:46:33 +02:00
9152de5f78 DB voir avec paul #4 2020-05-06 16:39:55 +02:00
fdf6fed74d Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 16:19:40 +02:00
2eba98b240 Quitter plateau non fini 2020-05-06 16:19:16 +02:00
4734e9bb7d Merging 2020-05-06 16:17:26 +02:00
24cc4909bf Changement des classes types par des enum 2020-05-06 16:15:36 +02:00
67d955b6d8 controller carte vision 2020-05-06 16:00:14 +02:00
4843f9932e BDD formatage script 90% #4 2020-05-06 15:40:34 +02:00
7d331ee7da correction merge main 2020-05-06 15:33:23 +02:00
2edaa6156e revert stash 2020-05-06 15:32:07 +02:00
e7ca21a33e revert stash 2020-05-06 15:31:27 +02:00
34e3690ba9 controller piocher et lancer des 2020-05-06 15:24:39 +02:00
13ae661b3b Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 15:11:02 +02:00
2a730c2c1a readme 2020-05-06 15:10:48 +02:00
1b554ad75c Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 14:40:24 +02:00
9885ed12ca Retrieving cards 2020-05-06 14:39:43 +02:00
96883dad89 ajout des regles du jeu 2020-05-06 14:37:59 +02:00
71b7a1cb2b Boutton quitter 2020-05-06 14:07:51 +02:00
70a214248d Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-05-06 13:27:04 +02:00
be7f6076f9 querry readAllBytes OK String to void #4 2020-05-06 13:26:53 +02:00
ce713d07e1 minor change 2020-05-06 13:25:49 +02:00
e13135d180 minor change 2020-05-06 13:25:08 +02:00
975cedb690 querry readAllBytes OK #4 2020-05-06 13:24:50 +02:00