Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git

2021-06-09 17:45:47 +02:00 · 2021-06-09 17:45:47 +02:00 · bcc822e093
commit bcc822e093
parent 0d929b67ca 7ce4646e82
3 changed files with 12 additions and 0 deletions
--- a/textures/Sprite.png
+++ b/textures/Sprite.png
--- a/textures/perso1_sprite(to
+++ b/textures/perso1_sprite(to
--- a/textures/sprite_action.txt
+++ b/textures/sprite_action.txt
@ -0,0 +1,12 @@
 1-idle
 2-walking
 3-jump
 4-forward jump
 5-crouch
 6-blocking
 7-L.punch
 8-crouch L.punch
 9-hit
 10-face hit
 11-h kick
 12--projectile