Fastium
|
45fdbf41d0
|
add attack + answer
|
2022-06-12 17:42:31 +02:00 |
|
Fastium
|
7cdedc2438
|
add prof
|
2022-06-12 15:19:13 +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 |
|
Fastium
|
d33945ccf4
|
b
|
2022-06-11 21:45:45 +02:00 |
|
Fastium
|
f21a8c7482
|
Update ScreenBattle.java
|
2022-06-11 19:32:43 +02:00 |
|
|
|
ba0f36625e
|
a
|
2022-06-11 19:18:10 +02:00 |
|
|
|
05e9e4d7ef
|
change the problem
|
2022-06-10 21:47:37 +02:00 |
|
|
|
b7704c1e79
|
clean
|
2022-06-10 19:46:59 +02:00 |
|
Rémi Heredero
|
eb6e6dac79
|
Merge pull request #13 from Klagarge/dialog-screen-battle
dialog ok
|
2022-06-10 19:41:37 +02:00 |
|
Rémi Heredero
|
52abcf1c02
|
Merge branch 'master' into dialog-screen-battle
|
2022-06-10 19:41:27 +02:00 |
|
|
|
74956e5e0b
|
first pass
|
2022-06-10 19:36:22 +02:00 |
|
Fastium
|
0fe608e183
|
dialog ok
|
2022-06-10 19:33:24 +02:00 |
|
Rémi Heredero
|
b3f77d2768
|
Merge pull request #12 from Klagarge:start-battle
Start-battle
|
2022-06-10 19:00:41 +02:00 |
|
|
|
91fda1acee
|
reset camera
|
2022-06-10 18:59:59 +02:00 |
|
|
|
697c9e659f
|
switch screen
|
2022-06-10 18:49:02 +02:00 |
|
Rémi Heredero
|
df732ad57f
|
Merge pull request #11 from Klagarge:detect-enemy
Detect-enemy
|
2022-06-10 16:50:44 +02:00 |
|
|
|
56d57ca17c
|
enemy integration done, but big bug when move
|
2022-06-10 16:39:50 +02:00 |
|
|
|
1466ba041a
|
detect enemy
|
2022-06-09 21:07:13 +02:00 |
|
Rémi Heredero
|
4c47120c40
|
Merge pull request #10 from Klagarge:polish-merge
Polish-merge
|
2022-06-09 19:23:13 +02:00 |
|
|
|
876cc9192e
|
poslish of polish
|
2022-06-09 19:20:43 +02:00 |
|
|
|
419c8ed93f
|
all merge done without error
|
2022-06-09 19:15:11 +02:00 |
|
Rémi Heredero
|
a2ef0d2725
|
Merge pull request #9 from Klagarge:dialog
Dialog
|
2022-06-09 18:26:10 +02:00 |
|
|
|
33be740b3d
|
small change
|
2022-06-09 18:24:25 +02:00 |
|
|
|
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 |
|
