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

• aca16a57f5 1.0.2 master 1.0.2 Rémi Heredero 2022-06-20 22:49:12 +02:00
• ad7432ce02 fix last answer Rémi Heredero 2022-06-20 22:44:45 +02:00
• 20ff589d82 1.0.2 Rémi Heredero 2022-06-20 17:10:39 +02:00
• 46ef9c5c82
  Merge pull request #51 from Klagarge:change-for-row Rémi Heredero 2022-06-20 17:01:39 +02:00
• 5d4aaa344d fix 4 attacks Rémi Heredero 2022-06-20 16:48:41 +02:00
• 2fcec74e00 fix random Rémi Heredero 2022-06-20 09:35:29 +02:00
• c94e170a30 add version Rémi Heredero 2022-06-19 23:29:02 +02:00
• c6b854948d with row done Rémi Heredero 2022-06-19 23:14:15 +02:00
• b60b71bc63 add jar Rémi Heredero 2022-06-19 18:18:55 +02:00
• 76725146b8 polish after merge Rémi Heredero 2022-06-19 18:11:52 +02:00
• 9fd232ab12
  Merge pull request #50 from Klagarge/master Rémi Heredero 2022-06-19 18:00:35 +02:00
• d39b79378f
  Merge pull request #49 from Klagarge:add-exterior Rémi Heredero 2022-06-19 17:56:31 +02:00
• dbbd9c7188 add audio Rémi Heredero 2022-06-19 17:48:30 +02:00
• 0813fd5254 file in jar Rémi Heredero 2022-06-19 17:39:41 +02:00
• adf854d15c change dela for change map Rémi Heredero 2022-06-19 13:08:33 +02:00
• 9e2e9dd739 exterior done Rémi Heredero 2022-06-18 12:18:33 +02:00
• 2e034c4f85 select answer with row Rémi Heredero 2022-06-17 21:45:05 +02:00
• 62716a5077
  Update README.md 1.0.0 Rémi Heredero 2022-06-17 15:39:08 +02:00
• db4a25c1d2
  Update README.md Rémi Heredero 2022-06-17 15:38:03 +02:00
• 27fce807da
  Update README.md Rémi Heredero 2022-06-17 15:37:17 +02:00
• 0ff9f77e27 add rapport Rémi Heredero 2022-06-17 15:32:05 +02:00
• d1b954ae91 comments Rémi Heredero 2022-06-17 14:26:50 +02:00
• c7c6274be1 change title Rémi Heredero 2022-06-17 13:26:53 +02:00
• 7273a6b1a3 comment settings Rémi Heredero 2022-06-17 10:39:29 +02:00
• f6f47d3063 change PokeMudry by PokeHES Rémi Heredero 2022-06-17 10:17:50 +02:00
• afe374c201
  Merge pull request #48 from Klagarge/comments-HER Rémi Heredero 2022-06-17 10:08:50 +02:00
• 805910b1b9 correct german Rémi Heredero 2022-06-17 10:07:10 +02:00
• 296caeb0e4
  Merge pull request #47 from Klagarge:comment-Yann Fastium 2022-06-17 09:40:01 +02:00
• cf4d09b985 c Fastium 2022-06-17 09:39:37 +02:00
• ae49a00f27 b Fastium 2022-06-17 09:38:00 +02:00
• bae3543a0b comments done Rémi Heredero 2022-06-17 09:21:07 +02:00
• f2f289672f a Fastium 2022-06-17 09:15:27 +02:00
• 769adeeeca fix error of merge Rémi Heredero 2022-06-17 09:05:22 +02:00
• b67798adb5
  Merge pull request #46 from Klagarge/add-FabLab Rémi Heredero 2022-06-17 08:57:02 +02:00
• 2ab5739649
  Merge branch 'master' into add-FabLab Rémi Heredero 2022-06-17 08:56:31 +02:00
• 82e2a0c059 comment Rémi Heredero 2022-06-17 08:48:57 +02:00
• 42ddda4ae4 remove testYann Rémi Heredero 2022-06-17 07:44:47 +02:00
• f2166d2b49 add jar Rémi Heredero 2022-06-17 07:40:18 +02:00
• 3f0e963366 add pokemon for enemy Rémi Heredero 2022-06-17 07:37:07 +02:00
• 27797fe7c7 Merge branch 'master' of https://github.com/Klagarge/PokeMudry Fastium 2022-06-16 23:31:18 +02:00
• 45b1539558 clean screenEnd Fastium 2022-06-16 23:31:15 +02:00
• 8d074674da
  Merge pull request #45 from Klagarge:Commentaire-yann Fastium 2022-06-16 23:30:01 +02:00
• 790fd9d4ec ok Fastium 2022-06-16 23:29:36 +02:00
• bb02aa00f9 polish Rémi Heredero 2022-06-16 22:09:17 +02:00
• 12ccf3f58a FabLab added Rémi Heredero 2022-06-16 21:08:31 +02:00
• 3e96178c0f oublier de mettre à 1600 pv le prof de math Fastium 2022-06-16 20:01:36 +02:00
• 738249ac45
  Merge pull request #44 from Klagarge:end-to-600-xp Fastium 2022-06-16 19:30:22 +02:00
• baff97fa03 display the pv of enemy ok Fastium 2022-06-16 19:30:07 +02:00
• aac7ba69f6 ok Fastium 2022-06-16 19:21:21 +02:00
• ab3292314d
  Merge pull request #43 from Klagarge:end-game Fastium 2022-06-16 19:15:25 +02:00
• b283460840 finsh text end Fastium 2022-06-16 19:14:46 +02:00
• d47a0acc8b
  Merge pull request #42 from Klagarge:equilibrage Rémi Heredero 2022-06-16 19:14:11 +02:00
• 4061053c56 fix accents Rémi Heredero 2022-06-16 18:59:45 +02:00
• 6197599f6b equilibrage done Rémi Heredero 2022-06-16 17:43:33 +02:00
• a62a239579
  Merge pull request #41 from Klagarge:end-battle Fastium 2022-06-16 17:16:30 +02:00
• 6794501109 ok end battle Fastium 2022-06-16 17:15:59 +02:00
• a53fc67f97
  Merge pull request #40 from Klagarge:add-profs-and-manage-pv-of-player Rémi Heredero 2022-06-16 17:00:23 +02:00
• 51198ff31c
  Merge pull request #39 from Klagarge:speech-enemy Fastium 2022-06-16 16:59:54 +02:00
• c2b290c03e add speechs of enemys Fastium 2022-06-16 16:59:11 +02:00
• b808af6adc add pv for player Rémi Heredero 2022-06-16 16:59:02 +02:00
• 3747d19255 add prof Rémi Heredero 2022-06-16 16:43:18 +02:00
• 220298c6d4 bug Fastium 2022-06-16 16:09:30 +02:00
• 2d6e572583
  Merge pull request #38 from Klagarge:add-prof Rémi Heredero 2022-06-16 16:03:43 +02:00
• bcd37fe183 first step Rémi Heredero 2022-06-16 15:52:01 +02:00
• da6d94945b
  Merge pull request #37 from Klagarge/battlescreen-display Rémi Heredero 2022-06-16 15:49:53 +02:00
• e590224acd
  Merge branch 'master' into battlescreen-display Rémi Heredero 2022-06-16 15:49:47 +02:00
• cad32fde7d add xp and pv on display Fastium 2022-06-16 15:46:34 +02:00
• a5c3c8bac5 enemy on battle Fastium 2022-06-16 15:02:20 +02:00
• ca902bb277
  Merge pull request #36 from Klagarge:time Rémi Heredero 2022-06-16 14:30:39 +02:00
• 20a4356f69 finish to add time Rémi Heredero 2022-06-16 14:24:20 +02:00
• e748f763a8 add format dialog Fastium 2022-06-16 12:23:33 +02:00
• f15d40d62a modif text enemy Fastium 2022-06-16 11:57:05 +02:00
• ada69759d5 move data Rémi Heredero 2022-06-16 10:26:51 +02:00
• 77ace754ff remove useless sound Rémi Heredero 2022-06-16 09:48:07 +02:00
• 429a3316d9 polish merge Rémi Heredero 2022-06-16 07:38:35 +02:00
• edd8e028d4
  Merge pull request #35 from Klagarge:xp-modifiaction Rémi Heredero 2022-06-16 07:26:38 +02:00
• 4063f505a4
  Merge branch 'master' into xp-modifiaction Rémi Heredero 2022-06-16 07:25:57 +02:00
• 5d0d638275 finish format text Fastium 2022-06-15 22:54:18 +02:00
• 83fc312efb add format speech Fastium 2022-06-15 22:29:34 +02:00
• 2f59cef9c0 add 21N1 Rémi Heredero 2022-06-15 22:07:17 +02:00
• 8c8c59411d a Fastium 2022-06-15 19:52:31 +02:00
• 782ddbcfd5
  Merge pull request #34 from Klagarge:add-21N1 Rémi Heredero 2022-06-15 18:34:28 +02:00
• 5217932eba add 21N1 + change both stairs Rémi Heredero 2022-06-15 18:33:50 +02:00
• 24774190b6 new font Fastium 2022-06-15 18:20:40 +02:00
• 045329d8f6 new font Fastium 2022-06-15 18:19:14 +02:00
• fee27ebbab
  Merge pull request #33 from Klagarge:add-enemies Rémi Heredero 2022-06-15 16:50:38 +02:00
• 907ae78eec finish to add enemy Rémi Heredero 2022-06-15 16:49:33 +02:00
• 62ebdf6248
  Merge pull request #32 from Klagarge/add-maps Rémi Heredero 2022-06-15 16:06:47 +02:00
• 6f5ba042ac done maps Rémi Heredero 2022-06-15 16:05:51 +02:00
• be69fa5705 some add Rémi Heredero 2022-06-15 14:32:09 +02:00
• 52bc6e9f22 fix map Rémi Heredero 2022-06-15 11:42:23 +02:00
• b944d9be51 xp modification Fastium 2022-06-15 09:53:54 +02:00
• da998e0862 some maps and fix turn, display and new sprite Rémi Heredero 2022-06-15 09:23:49 +02:00
• 997f303567 a Fastium 2022-06-15 08:20:28 +02:00
• 26a8b0280b xp modification Fastium 2022-06-14 12:51:47 +02:00
• c1ed41fdbe
  Merge pull request #31 from Klagarge:change Rémi Heredero 2022-06-14 05:31:22 +02:00
• 2934236281
  Merge branch 'master' into change Rémi Heredero 2022-06-14 05:31:06 +02:00
• 66cb496cf7 bug fix done Rémi Heredero 2022-06-14 05:28:43 +02:00
• b13b19c3fb fix " Rémi Heredero 2022-06-14 04:13:07 +02:00
• a6bc99cfdd
  Merge pull request #30 from Klagarge:addmaps Rémi Heredero 2022-06-14 04:01:15 +02:00