Skip to content

Commit

Permalink
Merge pull request SuperTux#988 from Rusty-Box/air-earth-hats
Browse files Browse the repository at this point in the history 
Improved hat designs for the air and earth powerup
  • Loading branch information
@tobbi
tobbi authored Dec 17, 2018
2 parents 1a46af1 + c2c4a27 commit 74fe26a
Show file tree
Hide file tree
Showing 45 changed files with 195 additions and 16 deletions.
Binary file modified data/images/creatures/tux/air/hat/backflip.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/buttjump-6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/duck.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/skid.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/spin-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/spin-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/spin-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/images/creatures/tux/air/hat/spin-3.png
View file
Binary file not shown.
Binary file modified data/images/creatures/tux/air/hat/stand.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/walk-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/air/hat/walk-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/air/hat/walk-7.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/creatures/tux/earth/hardhat/backflip.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-1.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-2.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-3.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-4.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-5.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/buttjump-6.png
View file
Binary file modified data/images/creatures/tux/earth/hardhat/duck.png
View file
Binary file modified data/images/creatures/tux/earth/hardhat/skid.png
View file
Binary file modified data/images/creatures/tux/earth/hardhat/stand.png
View file
Binary file modified data/images/creatures/tux/earth/hardhat/walk-0.png
View file
Binary file modified data/images/creatures/tux/earth/hardhat/walk-1.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-2.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-3.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-4.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-5.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-6.png
View file
Binary file added data/images/creatures/tux/earth/hardhat/walk-7.png
View file
211 changes: 195 additions & 16 deletions data/images/creatures/tux/powerups.sprite
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
(hitbox 15 14 32 64)
(images "air/hat/walk-0.png"
"air/hat/walk-1.png"
"air/hat/stand.png"
"air/hat/walk-0.png"
"air/hat/walk-1.png"
"air/hat/stand.png"))
"air/hat/walk-2.png"
"air/hat/walk-3.png"
"air/hat/walk-4.png"
"air/hat/walk-5.png"
"air/hat/walk-6.png"
"air/hat/walk-7.png"))

(action
(name "air-walk-left")
Expand All @@ -41,10 +43,10 @@
(name "air-jump-right")
(fps 10)
(hitbox 16 14 32 64)
(images "air/hat/stand.png"
(images "air/hat/spin-0.png"
"air/hat/spin-1.png"
"air/hat/spin-2.png"
"air/hat/spin-3.png"))
"air/hat/spin-1.png"))

(action
(name "air-jump-left")
Expand Down Expand Up @@ -75,9 +77,10 @@
(name "air-idle-right")
(fps 5)
(hitbox 16 14 32 64)
(images "air/hat/spin-1.png"
"air/hat/spin-2.png"
"air/hat/spin-3.png"))
(images "air/hat/spin-0.png"
"air/hat/spin-1.png"
"air/hat/spin-2.png"
"air/hat/spin-1.png"))

(action
(name "air-idle-left")
Expand Down Expand Up @@ -114,10 +117,97 @@
(hitbox 16 37 32 32)
(mirror-action "air-backflip-right"))

(action
(action
(name "air-buttjump-right")
(hitbox 16 14 32 64)
(images "air/hat/stand.png"))
(images "air/hat/buttjump-0.png"
"air/hat/buttjump-1.png"
"air/hat/buttjump-2.png"
"air/hat/buttjump-3.png"
"air/hat/buttjump-4.png"
"air/hat/buttjump-5.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"
"air/hat/buttjump-6.png"))

(action
(name "air-buttjump-left")
Expand All @@ -132,10 +222,12 @@
(hitbox 15 14 32 64)
(images "earth/hardhat/walk-0.png"
"earth/hardhat/walk-1.png"
"earth/hardhat/stand.png"
"earth/hardhat/walk-0.png"
"earth/hardhat/walk-1.png"
"earth/hardhat/stand.png"))
"earth/hardhat/walk-2.png"
"earth/hardhat/walk-3.png"
"earth/hardhat/walk-4.png"
"earth/hardhat/walk-5.png"
"earth/hardhat/walk-6.png"
"earth/hardhat/walk-7.png"))

(action
(name "earth-walk-left")
Expand Down Expand Up @@ -226,7 +318,94 @@
(action
(name "earth-buttjump-right")
(hitbox 16 14 32 64)
(images "earth/hardhat/stand.png"))
(images "earth/hardhat/buttjump-0.png"
"earth/hardhat/buttjump-1.png"
"earth/hardhat/buttjump-2.png"
"earth/hardhat/buttjump-3.png"
"earth/hardhat/buttjump-4.png"
"earth/hardhat/buttjump-5.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"
"earth/hardhat/buttjump-6.png"))

(action
(name "earth-buttjump-left")
Expand Down
Binary file modified data/images/objects/particles/airtux-hat.png
View file
Binary file modified data/images/objects/particles/earthtux-hardhat.png
View file

0 comments on commit 74fe26a

Please sign in to comment.