Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-11-04 05:09:18 +00:00
Code Releases Activity
200 Commits 1 Branch 2 Tags
0ff9f77e27260172a9ed00fb5595e0f7da5aef37
Commit Graph

200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Heredero
0ff9f77e27 add rapport 2022-06-17 15:32:05 +02:00
Rémi Heredero
d1b954ae91 comments 2022-06-17 14:26:50 +02:00
Rémi Heredero
c7c6274be1 change title 2022-06-17 13:26:53 +02:00
Rémi Heredero
7273a6b1a3 comment settings 2022-06-17 10:39:29 +02:00
Rémi Heredero
f6f47d3063 change PokeMudry by PokeHES 2022-06-17 10:17:50 +02:00
Rémi Heredero
afe374c201 Merge pull request #48 from Klagarge/comments-HER 
Comments her
 2022-06-17 10:08:50 +02:00
Rémi Heredero
805910b1b9 correct german 2022-06-17 10:07:10 +02:00
Fastium
296caeb0e4 Merge pull request #47 from Klagarge:comment-Yann 
Comment-Yann
 2022-06-17 09:40:01 +02:00
Fastium
cf4d09b985 c 2022-06-17 09:39:37 +02:00
Fastium
ae49a00f27 b 2022-06-17 09:38:00 +02:00
Rémi Heredero
bae3543a0b comments done 2022-06-17 09:21:07 +02:00
Fastium
f2f289672f a 2022-06-17 09:15:27 +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