Commit Graph

Select branches

Hide Pull Requests

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#6

#7

#8

#9

1.0.0

1.0.2

Mono Color

• dee8cad542 Merge branch 'master' into addmaps Rémi Heredero 2022-06-14 04:01:05 +02:00
• 3e4e32fd10 add 2 and a door Rémi Heredero 2022-06-14 03:56:02 +02:00
• ccf38809b9 change the world Fastium 2022-06-14 01:14:54 +02:00
• 08e2a1eed2 xp modifiaction Fastium 2022-06-13 23:12:12 +02:00
• 744b160542 xp modification Fastium 2022-06-13 23:11:17 +02:00
• b4a899bdcd Merge pull request #29 from Klagarge:fix-for-yann Rémi Heredero 2022-06-13 22:35:48 +02:00
• b5f0cebfe1 done Rémi Heredero 2022-06-13 22:35:15 +02:00
• 260515519e add one Rémi Heredero 2022-06-13 22:33:58 +02:00
• 27ea0b2f05 sad change Fastium 2022-06-13 22:03:18 +02:00
• 4d38088397 change screen battle Fastium 2022-06-13 21:58:24 +02:00
• 7a5cdf9f2d change screen battle Fastium 2022-06-13 21:58:13 +02:00
• 2b630e1b45 adjust screen battle Fastium 2022-06-13 21:57:14 +02:00
• f53db05cc9 adjust screenbattle Fastium 2022-06-13 21:57:01 +02:00
• 0d2748abb0 Merge branch 'master' of https://github.com/Klagarge/PokeMudry Fastium 2022-06-13 21:54:10 +02:00
• b3b02c4f06 change screenBattleOn Fastium 2022-06-13 21:54:05 +02:00
• 5a8cfeef4e change screenBattleOn Fastium 2022-06-13 21:52:49 +02:00
• 67ccb8cca4 Merge pull request #28 from Klagarge:win-game Fastium 2022-06-13 20:41:50 +01:00
• 2d2095a65a fonctionniert Fastium 2022-06-13 21:38:00 +02:00
• 47b86dd6c8 Merge pull request #27 from Klagarge:fix-merge Rémi Heredero 2022-06-13 21:10:05 +02:00
• ceb71643b1 fix done Rémi Heredero 2022-06-13 21:08:11 +02:00
• 50760ddfd5 Merge pull request #26 from Klagarge/check-answer Rémi Heredero 2022-06-13 20:57:17 +02:00
• 1ecb376a55 Merge pull request #25 from Klagarge/add-maps Rémi Heredero 2022-06-13 20:53:50 +02:00
• ba7694528f should work Fastium 2022-06-13 20:53:09 +02:00
• a66677e0ca some adds Rémi Heredero 2022-06-13 20:30:02 +02:00
• a4b760fe66 Merge pull request #24 from Klagarge:bug-fix-camera-jump Rémi Heredero 2022-06-13 19:31:41 +02:00
• e71d23dd81 fix bug !!! (hallelujah) Rémi Heredero 2022-06-13 19:26:52 +02:00
• 6d71baa535 Merge pull request #23 from Klagarge/add-maps Rémi Heredero 2022-06-13 18:28:23 +02:00
• 93688eb1c2 add 3 maps Rémi Heredero 2022-06-13 18:06:38 +02:00
• 1915af7a8e Merge pull request #22 from Klagarge/random-answer Fastium 2022-06-13 10:41:49 +01:00
• 7633d81737 finish Fastium 2022-06-13 11:41:24 +02:00
• de2746de40 21N3 Rémi Heredero 2022-06-12 18:47:19 +02:00
• 295a3349d9 Merge pull request #21 from Klagarge/professor Fastium 2022-06-12 16:42:49 +01:00
• 45fdbf41d0 add attack + answer Fastium 2022-06-12 17:42:31 +02:00
• 2c9c5ad01c Merge pull request #20 from Klagarge:polish Rémi Heredero 2022-06-12 17:02:54 +02:00
• 317aae0432 polish done Rémi Heredero 2022-06-12 17:02:27 +02:00
• 23fe6f1ad9 Merge pull request #19 from Klagarge:add-maps Rémi Heredero 2022-06-12 16:43:50 +02:00
• 49983d67c9 Merge pull request #18 from Klagarge:buf-fix Rémi Heredero 2022-06-12 16:37:10 +02:00
• 150cb3ab11 done Rémi Heredero 2022-06-12 16:33:04 +02:00
• 803a352046 Merge pull request #17 from Klagarge/professor Fastium 2022-06-12 14:19:34 +01:00
• 7cdedc2438 add prof Fastium 2022-06-12 15:19:13 +02:00
• 447919fbca create png Rémi Heredero 2022-06-12 14:43:35 +02:00
• 7f7642d728 Merge pull request #16 from Klagarge/battle-game Rémi Heredero 2022-06-12 14:33:33 +02:00
• ac5ce35a19 Merge branch 'master' into battle-game Rémi Heredero 2022-06-12 14:33:26 +02:00
• 6248936e5a d Fastium 2022-06-12 14:26:02 +02:00
• 32636500d0 Merge pull request #14 from Klagarge:polish Rémi Heredero 2022-06-12 12:37:39 +02:00
• 5008b6e18a polish and bug fix Rémi Heredero 2022-06-12 12:35:08 +02:00
• c121320a04 c Fastium 2022-06-12 12:10:57 +02:00
• d33945ccf4 b Fastium 2022-06-11 21:45:45 +02:00
• f21a8c7482 Update ScreenBattle.java Fastium 2022-06-11 19:32:43 +02:00
• ba0f36625e a Fastium 2022-06-11 19:18:10 +02:00
• 05e9e4d7ef change the problem Fastium 2022-06-10 21:47:37 +02:00
• b7704c1e79 clean Rémi Heredero 2022-06-10 19:46:59 +02:00
• eb6e6dac79 Merge pull request #13 from Klagarge/dialog-screen-battle Rémi Heredero 2022-06-10 19:41:37 +02:00
• 52abcf1c02 Merge branch 'master' into dialog-screen-battle Rémi Heredero 2022-06-10 19:41:27 +02:00
• 74956e5e0b first pass Rémi Heredero 2022-06-10 19:36:22 +02:00
• 0fe608e183 dialog ok Fastium 2022-06-10 19:33:24 +02:00
• b3f77d2768 Merge pull request #12 from Klagarge:start-battle Rémi Heredero 2022-06-10 19:00:41 +02:00
• 91fda1acee reset camera Rémi Heredero 2022-06-10 18:59:59 +02:00
• 697c9e659f switch screen Rémi Heredero 2022-06-10 18:49:02 +02:00
• df732ad57f Merge pull request #11 from Klagarge:detect-enemy Rémi Heredero 2022-06-10 16:50:44 +02:00
• 56d57ca17c enemy integration done, but big bug when move Rémi Heredero 2022-06-10 16:39:50 +02:00
• 1466ba041a detect enemy Rémi Heredero 2022-06-09 21:07:13 +02:00
• 4c47120c40 Merge pull request #10 from Klagarge:polish-merge Rémi Heredero 2022-06-09 19:23:13 +02:00
• 876cc9192e poslish of polish Rémi Heredero 2022-06-09 19:20:43 +02:00
• 419c8ed93f all merge done without error Rémi Heredero 2022-06-09 19:15:11 +02:00
• a2ef0d2725 Merge pull request #9 from Klagarge:dialog Rémi Heredero 2022-06-09 18:26:10 +02:00
• 33be740b3d small change Rémi Heredero 2022-06-09 18:24:25 +02:00
• 8991c6efb9 Merge branch 'master' into dialog Rémi Heredero 2022-06-09 18:21:27 +02:00
• abe0bcff73 Merge pull request #8 from Klagarge:polish-merge Rémi Heredero 2022-06-09 17:35:12 +02:00
• 3d05c1e5fa done Rémi Heredero 2022-06-09 17:32:47 +02:00
• 0fc97ac683 new vector to display speech Fastium 2022-06-09 06:58:49 +02:00
• aaeb151c43 avancée sur la base de donnée des attaques et discours Fastium 2022-06-08 23:30:15 +02:00
• 5573b545e0 Merge pull request #7 from Klagarge/more-entities Rémi Heredero 2022-06-08 20:19:48 +02:00
• 659096b3e2 Merge branch 'master' into more-entities Rémi Heredero 2022-06-08 20:19:41 +02:00
• cd64313dec add enemy but no interaction Rémi Heredero 2022-06-08 20:18:22 +02:00
• 4843f5d1d8 near to done Rémi Heredero 2022-06-08 20:08:18 +02:00
• 1a84524e14 Merge pull request #6 from Klagarge/fight-data Fastium 2022-06-08 19:04:37 +01:00
• 0e4780ba43 add fight data at enemy Fastium 2022-06-08 20:04:16 +02:00
• 88519adaf2 add fight data Fastium 2022-06-08 19:04:37 +02:00
• 387af4d610 Merge pull request #5 from Klagarge/TileScreen-and-BattleScreen Fastium 2022-06-08 17:51:36 +01:00
• 8f0eb5bd52 Merge branch 'TileScreen-and-BattleScreen' of https://github.com/Klagarge/PokeMudry into TileScreen-and-BattleScreen Fastium 2022-06-08 18:51:01 +02:00
• 77b506b14e Update .gitignore Fastium 2022-06-08 18:50:57 +02:00
• 7c108fbff0 Merge pull request #4 from Klagarge/TileScreen-and-BattleScreen Fastium 2022-06-08 17:49:59 +01:00
• 57732c9464 Delete bin directory Fastium 2022-06-08 17:49:49 +01:00
• 07e104fa88 finish implement screen Fastium 2022-06-08 18:47:33 +02:00
• d522fff056 battleScreen and testYann Fastium 2022-06-08 09:53:51 +02:00
• c6d699fcfa Delete bin directory Rémi Heredero 2022-06-08 08:48:41 +02:00
• b3cdc58ec6 Merge branch 'master' of https://github.com/Klagarge/PokeMudry Fastium 2022-06-08 08:27:53 +02:00
• 3368e1b8c4 add *Tiled Rémi Heredero 2022-06-08 08:25:20 +02:00
• ea1e211736 Merge pull request #3 from Klagarge/add-Entity Rémi Heredero 2022-06-07 21:36:31 +02:00
• 4e28801b38 done Rémi Heredero 2022-06-07 21:35:13 +02:00
• c93d912730 Merge branches 'master' and 'master' of https://github.com/Klagarge/PokeMudry Fastium 2022-06-06 20:51:01 +02:00
• ce9ff7ca53 add ressources Rémi Heredero 2022-06-06 14:10:19 +02:00
• 622e072481 convert with lib Rémi Heredero 2022-06-06 13:48:20 +02:00
• 4c99bb5629 now on tests_gdx2d_gradle Rémi Heredero 2022-06-03 15:50:48 +02:00
• 28c14ce9c3 Merge pull request #2 from Klagarge/Add-Screen Rémi Heredero 2022-06-02 16:09:20 +02:00
• 9a26efd665 Merge branch 'master' into Add-Screen Rémi Heredero 2022-06-02 16:08:31 +02:00
• 0c11a5521f repare Rémi Heredero 2022-06-02 16:06:24 +02:00
• bcd1434bc1 test 7 Rémi Heredero 2022-06-02 14:19:10 +02:00
• 63f46d60db test 6 Rémi Heredero 2022-06-02 13:54:29 +02:00