Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-10-29 11:01:07 +00:00
Code Releases Activity
189 Commits 1 Branch 2 Tags
bae3543a0b569a093169dcb0bd8df786ee1c45fc
Commit Graph

189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Heredero
bae3543a0b comments done 2022-06-17 09:21:07 +02:00
Rémi Heredero
769adeeeca fix error of merge 2022-06-17 09:05:22 +02:00
Rémi Heredero
b67798adb5 Merge pull request #46 from Klagarge/add-FabLab 
Add-FabLab
 2022-06-17 08:57:02 +02:00
Rémi Heredero
2ab5739649 Merge branch 'master' into add-FabLab 2022-06-17 08:56:31 +02:00
Rémi Heredero
82e2a0c059 comment 2022-06-17 08:48:57 +02:00
Rémi Heredero
42ddda4ae4 remove testYann 2022-06-17 07:44:47 +02:00
Rémi Heredero
f2166d2b49 add jar 2022-06-17 07:40:18 +02:00
Rémi Heredero
3f0e963366 add pokemon for enemy 2022-06-17 07:37:07 +02:00
Fastium
27797fe7c7 Merge branch 'master' of https://github.com/Klagarge/PokeMudry 2022-06-16 23:31:18 +02:00
Fastium
45b1539558 clean screenEnd 2022-06-16 23:31:15 +02:00
Fastium
8d074674da Merge pull request #45 from Klagarge:Commentaire-yann 
ok
 2022-06-16 23:30:01 +02:00
Fastium
790fd9d4ec ok 2022-06-16 23:29:36 +02:00
Rémi Heredero
bb02aa00f9 polish 2022-06-16 22:09:17 +02:00
Rémi Heredero
12ccf3f58a FabLab added 2022-06-16 21:08:31 +02:00
Fastium
3e96178c0f oublier de mettre à 1600 pv le prof de math 2022-06-16 20:01:36 +02:00
Fastium
738249ac45 Merge pull request #44 from Klagarge:end-to-600-xp 
End-to-600-xp
 2022-06-16 19:30:22 +02:00
Fastium
baff97fa03 display the pv of enemy ok 2022-06-16 19:30:07 +02:00
Fastium
aac7ba69f6 ok 2022-06-16 19:21:21 +02:00
Fastium
ab3292314d Merge pull request #43 from Klagarge:end-game 
finsh text end
 2022-06-16 19:15:25 +02:00
Fastium
b283460840 finsh text end 2022-06-16 19:14:46 +02:00
Rémi Heredero
d47a0acc8b Merge pull request #42 from Klagarge:equilibrage 
Equilibrage
 2022-06-16 19:14:11 +02:00
Rémi Heredero
4061053c56 fix accents 2022-06-16 18:59:45 +02:00
Rémi Heredero
6197599f6b equilibrage done 2022-06-16 17:43:33 +02:00
Fastium
a62a239579 Merge pull request #41 from Klagarge:end-battle 
ok end battle
 2022-06-16 17:16:30 +02:00
Fastium
6794501109 ok end battle 2022-06-16 17:15:59 +02:00
Rémi Heredero
a53fc67f97 Merge pull request #40 from Klagarge:add-profs-and-manage-pv-of-player 
Add-profs-and-manage-pv-of-player
 2022-06-16 17:00:23 +02:00
Fastium
51198ff31c Merge pull request #39 from Klagarge:speech-enemy 
add speechs of enemys
 2022-06-16 16:59:54 +02:00
Fastium
c2b290c03e add speechs of enemys 2022-06-16 16:59:11 +02:00
Rémi Heredero
b808af6adc add pv for player 2022-06-16 16:59:02 +02:00
Rémi Heredero
3747d19255 add prof 2022-06-16 16:43:18 +02:00
Fastium
220298c6d4 bug 2022-06-16 16:09:30 +02:00
Rémi Heredero
2d6e572583 Merge pull request #38 from Klagarge:add-prof 
first step
 2022-06-16 16:03:43 +02:00
Rémi Heredero
bcd37fe183 first step 2022-06-16 15:52:01 +02:00
Rémi Heredero
da6d94945b Merge pull request #37 from Klagarge/battlescreen-display 
Battlescreen-display
 2022-06-16 15:49:53 +02:00
Rémi Heredero
e590224acd Merge branch 'master' into battlescreen-display 2022-06-16 15:49:47 +02:00
Fastium
cad32fde7d add xp and pv on display 2022-06-16 15:46:34 +02:00
Fastium
a5c3c8bac5 enemy on battle 2022-06-16 15:02:20 +02:00
Rémi Heredero
ca902bb277 Merge pull request #36 from Klagarge:time 
finish to add time
 2022-06-16 14:30:39 +02:00
Rémi Heredero
20a4356f69 finish to add time 2022-06-16 14:24:20 +02:00
Fastium
e748f763a8 add format dialog 2022-06-16 12:23:33 +02:00
Fastium
f15d40d62a modif text enemy 2022-06-16 11:57:05 +02:00
Rémi Heredero
ada69759d5 move data 2022-06-16 10:26:51 +02:00
Rémi Heredero
77ace754ff remove useless sound 2022-06-16 09:48:07 +02:00
Rémi Heredero
429a3316d9 polish merge 2022-06-16 07:38:35 +02:00
Rémi Heredero
edd8e028d4 Merge pull request #35 from Klagarge:xp-modifiaction 
Xp-modifiaction
 2022-06-16 07:26:38 +02:00
Rémi Heredero
4063f505a4 Merge branch 'master' into xp-modifiaction 2022-06-16 07:25:57 +02:00
Fastium
5d0d638275 finish format text 2022-06-15 22:54:18 +02:00
Fastium
83fc312efb add format speech 2022-06-15 22:29:34 +02:00
Rémi Heredero
2f59cef9c0 add 21N1 2022-06-15 22:07:17 +02:00
Fastium
8c8c59411d a 2022-06-15 19:52:31 +02:00