Merge remote-tracking branch 'origin/master'

textures/sprite_action.txt

@@ -1,12 +1,47 @@
 1-idle
 2-walking
 3-jump
-4-forward jump
+4-crouch
-5-crouch
+5-blocking
-6-blocking
+6-L_punch
-7-L.punch
+7-forward jump
-8-crouch L.punch
+8-m/h punch
-9-hit
+9-forward h punch
-10-face hit
+10-h kick
-11-h kick
+11-forward h kick
-12--projectile 
+12-jump l m kick
+13-crouch L.punch
+14-crouch m punch
+15-crouch h punch
+16-jump h kick
+17-crouch hit
+18-fjl punch
+19-hadouken
+20-projectile
+21-hit
+22-jump l m h puch 
+23-face hit
+24-ko
+25-lm kick
+26-forward m punch
+27-forward l kick
+28-crouch L kick 
+29-shouryuken
+30-forward m kick
+31-victory 1
+32-stunned
+33-knockdown/recover
+
+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)