1
0
mirror of https://github.com/Klagarge/PokeHES.git synced 2024-11-26 19:13:27 +00:00
Commit Graph

173 Commits

Author SHA1 Message Date
66cb496cf7 bug fix done 2022-06-14 05:28:43 +02:00
b13b19c3fb fix " 2022-06-14 04:13:07 +02:00
Rémi Heredero
a6bc99cfdd
Merge pull request #30 from Klagarge:addmaps
Addmaps
2022-06-14 04:01:15 +02:00
Rémi Heredero
dee8cad542
Merge branch 'master' into addmaps 2022-06-14 04:01:05 +02:00
3e4e32fd10 add 2 and a door 2022-06-14 03:56:02 +02:00
Fastium
ccf38809b9 change the world 2022-06-14 01:14:54 +02:00
Fastium
08e2a1eed2 xp modifiaction 2022-06-13 23:12:12 +02:00
Fastium
744b160542 xp modification 2022-06-13 23:11:17 +02:00
Rémi Heredero
b4a899bdcd
Merge pull request #29 from Klagarge:fix-for-yann
done
2022-06-13 22:35:48 +02:00
b5f0cebfe1 done 2022-06-13 22:35:15 +02:00
260515519e add one 2022-06-13 22:33:58 +02:00
Fastium
27ea0b2f05 sad change 2022-06-13 22:03:18 +02:00
Fastium
4d38088397 change screen battle 2022-06-13 21:58:24 +02:00
Fastium
7a5cdf9f2d change screen battle 2022-06-13 21:58:13 +02:00
Fastium
2b630e1b45 adjust screen battle 2022-06-13 21:57:14 +02:00
Fastium
f53db05cc9 adjust screenbattle 2022-06-13 21:57:01 +02:00
Fastium
0d2748abb0 Merge branch 'master' of https://github.com/Klagarge/PokeMudry 2022-06-13 21:54:10 +02:00
Fastium
b3b02c4f06 change screenBattleOn 2022-06-13 21:54:05 +02:00
Fastium
5a8cfeef4e change screenBattleOn 2022-06-13 21:52:49 +02:00
Fastium
67ccb8cca4
Merge pull request #28 from Klagarge:win-game
fonctionniert
2022-06-13 20:41:50 +01:00
Fastium
2d2095a65a fonctionniert 2022-06-13 21:38:00 +02:00
Rémi Heredero
47b86dd6c8
Merge pull request #27 from Klagarge:fix-merge
fix done
2022-06-13 21:10:05 +02:00
ceb71643b1 fix done 2022-06-13 21:08:11 +02:00
Rémi Heredero
50760ddfd5
Merge pull request #26 from Klagarge/check-answer
should work
2022-06-13 20:57:17 +02:00
Rémi Heredero
1ecb376a55
Merge pull request #25 from Klagarge/add-maps
some adds
2022-06-13 20:53:50 +02:00
Fastium
ba7694528f should work 2022-06-13 20:53:09 +02:00
a66677e0ca some adds 2022-06-13 20:30:02 +02:00
Rémi Heredero
a4b760fe66
Merge pull request #24 from Klagarge:bug-fix-camera-jump
fix bug !!! (hallelujah)
2022-06-13 19:31:41 +02:00
e71d23dd81 fix bug !!! (hallelujah) 2022-06-13 19:26:52 +02:00
Rémi Heredero
6d71baa535
Merge pull request #23 from Klagarge/add-maps
Add maps
2022-06-13 18:28:23 +02:00
93688eb1c2 add 3 maps 2022-06-13 18:06:38 +02:00
Fastium
1915af7a8e
Merge pull request #22 from Klagarge/random-answer
finish
2022-06-13 10:41:49 +01:00
Fastium
7633d81737 finish 2022-06-13 11:41:24 +02:00
de2746de40 21N3 2022-06-12 18:47:19 +02:00
Fastium
295a3349d9
Merge pull request #21 from Klagarge/professor
add attack + answer
2022-06-12 16:42:49 +01:00
Fastium
45fdbf41d0 add attack + answer 2022-06-12 17:42:31 +02:00
Rémi Heredero
2c9c5ad01c
Merge pull request #20 from Klagarge:polish
polish done
2022-06-12 17:02:54 +02:00
317aae0432 polish done 2022-06-12 17:02:27 +02:00
Rémi Heredero
23fe6f1ad9
Merge pull request #19 from Klagarge:add-maps
create png
2022-06-12 16:43:50 +02:00
Rémi Heredero
49983d67c9
Merge pull request #18 from Klagarge:buf-fix
done
2022-06-12 16:37:10 +02:00
150cb3ab11 done 2022-06-12 16:33:04 +02:00
Fastium
803a352046
Merge pull request #17 from Klagarge/professor
add prof
2022-06-12 14:19:34 +01:00
Fastium
7cdedc2438 add prof 2022-06-12 15:19:13 +02:00
447919fbca create png 2022-06-12 14:43:35 +02:00
Rémi Heredero
7f7642d728
Merge pull request #16 from Klagarge/battle-game
Master
2022-06-12 14:33:33 +02:00
Rémi Heredero
ac5ce35a19
Merge branch 'master' into battle-game 2022-06-12 14:33:26 +02:00
Fastium
6248936e5a d 2022-06-12 14:26:02 +02:00
Rémi Heredero
32636500d0
Merge pull request #14 from Klagarge:polish
Polish
2022-06-12 12:37:39 +02:00
5008b6e18a polish and bug fix 2022-06-12 12:35:08 +02:00
c121320a04 c 2022-06-12 12:10:57 +02:00