326 Commits

Author SHA1 Message Date
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
Yessine Ben El Bey
36dff30b84 Ecran parametre 2020-04-27 17:09:53 +02:00
JunkJumper
6ae0587ce8
Delete databse.tar 2020-04-27 17:00:03 +02:00
JunkJumper
35f1785105 gitignore fix 2020-04-27 16:59:25 +02:00
JunkJumper
3926e75d1b sql final db 2020-04-27 16:58:27 +02:00
JunkJumper
977a116f9e Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 16:58:23 +02:00
Chiara
8c55091fb2 changement des 2020-04-27 16:53:32 +02:00
Chiara
9e468f5f14 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 16:06:27 +02:00
JunkJumper
71a1cc960e
Add files via upload 2020-04-27 16:04:33 +02:00
JunkJumper
15aafe859f
Delete database.sql 2020-04-27 16:04:10 +02:00
JunkJumper
30778f6ec2 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 16:03:37 +02:00
JunkJumper
e547fcdcea ipt sql tar #4 2020-04-27 16:02:57 +02:00
nawfe
ec56b68cdf Traduction 2020-04-27 16:02:04 +02:00
Chiara
318d439d6f Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 15:43:19 +02:00
JunkJumper
47bbbe569c script sql #4 2020-04-27 15:42:58 +02:00
Chiara
cefc6ceb75 Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 15:37:19 +02:00
Chiara
bff45c162a animation des 2020-04-27 15:37:05 +02:00
JunkJumper
d2acd6c92c Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development 2020-04-27 15:34:56 +02:00
JunkJumper
ab4bea1e95 script sql #4 2020-04-27 15:33:50 +02:00
Bastien NOEL
aa73c3c6ea correction des boutons de choix des joueurs 2020-04-27 14:32:50 +02:00
JunkJumper
3d4e66828e Database Management classes #4 2020-04-27 14:04:23 +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
76c1652fd9 Traduction 2020-04-24 16:55:02 +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