Merge remote-tracking branch 'origin/master'

2021-06-20 17:00:51 +02:00 · 2021-06-20 17:00:51 +02:00 · c456d2f8c5
commit c456d2f8c5
parent 11639912ad 51fb72fc79
3 changed files with 8 additions and 10 deletions
--- a/textures/Sprite_9comp.png
+++ b/textures/Sprite_9comp.png
--- a/textures/Sprite_sans_grille_9comp.png
+++ b/textures/Sprite_sans_grille_9comp.png
--- a/textures/sprite_action.txt
+++ b/textures/sprite_action.txt
@ -31,17 +31,15 @@
 31-victory 1
 32-stunned
 33-knockdown/recover
+34-tatsumaki senpuu kyaku
+35-victory 2
+36-crouch m kick 
+37-crouch h kick
+38-forward jump m h kick 
+39-mugshots
+40-shoulder toss (32)
+41-backroll

 manquant:
-
-crouch m kick (21)
-crouch h kick (22)
-forward jump m h kick (27)
-tatsumaki senpuu kyaku (29)
-shoulder toss (32)
-backroll(33)
-
-victory 2 (39)
 time over (40)
 alternate palettes(41)
-mugshots(42)