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 |
|
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 |
|
