1
0
mirror of https://github.com/Klagarge/PokeHES.git synced 2024-11-23 09:53:28 +00:00
Commit Graph

153 Commits

Author SHA1 Message Date
8991c6efb9 Merge branch 'master' into dialog 2022-06-09 18:21:27 +02:00
Rémi Heredero
abe0bcff73
Merge pull request #8 from Klagarge:polish-merge
done
2022-06-09 17:35:12 +02:00
3d05c1e5fa done 2022-06-09 17:32:47 +02:00
0fc97ac683 new vector to display speech 2022-06-09 06:58:49 +02:00
Fastium
aaeb151c43 avancée sur la base de donnée des attaques et discours 2022-06-08 23:30:15 +02:00
Rémi Heredero
5573b545e0
Merge pull request #7 from Klagarge/more-entities
More entities
2022-06-08 20:19:48 +02:00
Rémi Heredero
659096b3e2
Merge branch 'master' into more-entities 2022-06-08 20:19:41 +02:00
cd64313dec add enemy but no interaction 2022-06-08 20:18:22 +02:00
4843f5d1d8 near to done 2022-06-08 20:08:18 +02:00
Fastium
1a84524e14
Merge pull request #6 from Klagarge/fight-data
add fight data at enemy
2022-06-08 19:04:37 +01:00
Fastium
0e4780ba43 add fight data at enemy 2022-06-08 20:04:16 +02:00
Fastium
88519adaf2 add fight data 2022-06-08 19:04:37 +02:00
Fastium
387af4d610
Merge pull request #5 from Klagarge/TileScreen-and-BattleScreen
Tile screen and battle screen
2022-06-08 17:51:36 +01:00
Fastium
8f0eb5bd52 Merge branch 'TileScreen-and-BattleScreen' of https://github.com/Klagarge/PokeMudry into TileScreen-and-BattleScreen 2022-06-08 18:51:01 +02:00
Fastium
77b506b14e Update .gitignore 2022-06-08 18:50:57 +02:00
Fastium
7c108fbff0
Merge pull request #4 from Klagarge/TileScreen-and-BattleScreen
add BattleScreen and MapScreen
2022-06-08 17:49:59 +01:00
Fastium
57732c9464
Delete bin directory 2022-06-08 17:49:49 +01:00
Fastium
07e104fa88 finish implement screen 2022-06-08 18:47:33 +02:00
Fastium
d522fff056 battleScreen and testYann 2022-06-08 09:53:51 +02:00
Rémi Heredero
c6d699fcfa
Delete bin directory 2022-06-08 08:48:41 +02:00
Fastium
b3cdc58ec6 Merge branch 'master' of https://github.com/Klagarge/PokeMudry 2022-06-08 08:27:53 +02:00
3368e1b8c4 add *Tiled 2022-06-08 08:25:20 +02:00
Rémi Heredero
ea1e211736
Merge pull request #3 from Klagarge/add-Entity
done
2022-06-07 21:36:31 +02:00
4e28801b38 done 2022-06-07 21:35:13 +02:00
c93d912730 Merge branches 'master' and 'master' of https://github.com/Klagarge/PokeMudry 2022-06-06 20:51:01 +02:00
ce9ff7ca53 add ressources 2022-06-06 14:10:19 +02:00
622e072481 convert with lib 2022-06-06 13:48:20 +02:00
4c99bb5629 now on tests_gdx2d_gradle 2022-06-03 15:50:48 +02:00
Rémi Heredero
28c14ce9c3
Merge pull request #2 from Klagarge/Add-Screen
Add screen
2022-06-02 16:09:20 +02:00
Rémi Heredero
9a26efd665
Merge branch 'master' into Add-Screen 2022-06-02 16:08:31 +02:00
0c11a5521f repare 2022-06-02 16:06:24 +02:00
bcd1434bc1 test 7 2022-06-02 14:19:10 +02:00
63f46d60db test 6 2022-06-02 13:54:29 +02:00
8ef3225688 test 5 2022-06-02 13:53:53 +02:00
b2bd621310 test 5 2022-06-02 13:52:48 +02:00
2ef20bdb62 test 4 2022-06-02 13:51:47 +02:00
61eb86b6d9 test3 2022-06-02 13:50:48 +02:00
a8d65d77de test 2 2022-06-02 13:48:37 +02:00
d03caa9877 test bin 2022-06-02 13:47:12 +02:00
493be25fe2 test bin 2022-06-02 13:46:00 +02:00
Fastium
eb74c17474 del branche 2022-06-02 13:38:25 +02:00
Rémi Heredero
f500e7fc0e
Delete app/bin directory 2022-06-02 13:35:27 +02:00
Rémi Heredero
93139af458
Merge pull request #1 from Klagarge/Add-Screen
Add screen
2022-06-02 13:35:09 +02:00
3427970431 test 2022-06-02 13:30:19 +02:00
2b1b37b419 add gitignore 2022-06-02 13:28:58 +02:00
a4402cb4ab a part 2022-06-02 13:26:43 +02:00
ba9aa340be 01/06 2022-06-02 12:38:42 +02:00
df0055edf7 add map + assets 2022-06-01 18:17:54 +02:00
7908d62583 create packages + class 2022-06-01 16:47:53 +02:00
2b73cff725 init HER 2022-05-25 15:35:23 +02:00