Skip to content

Commit

Permalink
SWIMMING!!!
Browse files Browse the repository at this point in the history
* Add new swimming sprites

* Update math files

* Update badguy

* Revert badguy problems

* Update object files (a lot of stuff needs removal)

* Update block file

* Update player file

* Update player files again

Removed stuff like walljump, icedash, sliding... unfinished stuff. Might need another commit

* Again

* Fix standup

* UPDATE CAMERA

* Fix 2 bugs

* Fix another small bug

* Add missing falling actions

* Fix a small workaround

* Offset Tux height and add swimgrow

* Add swimgrow animation

* Add swimgrow images

* Add new test levelset with a swimming level

* Update powerup hats

* Fix swimjumping when small

* Make the fireflower work properly underwater

* Play yippee noise in water
  • Loading branch information
weluvgoatz authored May 31, 2020
1 parent 7d36427 commit 6f938bc
Show file tree
Hide file tree
Showing 90 changed files with 1,890 additions and 78 deletions.
Binary file added data/images/creatures/tux/air/aswim1.png
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/aswim2.png
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/aswim3.png
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/aswim4.png
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/aswim5.png
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/aswimidle.png
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/aswimup1.png
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/aswimup2.png
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/aswimup3.png
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/aswimup4.png
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/aswimup5.png
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/big/swimidle1.png
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/big/swimup1.png
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/big/swimup2.png
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/big/swimup3.png
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/big/swimup4.png
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/big/swimup5.png
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/eswim1.png
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/eswim2.png
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/eswim3.png
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/eswim4.png
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/eswim5.png
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/eswimidle.png
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/eswimup1.png
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/eswimup2.png
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/eswimup3.png
Binary file added data/images/creatures/tux/earth/eswimup4.png
Binary file added data/images/creatures/tux/earth/eswimup5.png
Binary file added data/images/creatures/tux/fire/fswim1.png
Binary file added data/images/creatures/tux/fire/fswim2.png
Binary file added data/images/creatures/tux/fire/fswim3.png
Binary file added data/images/creatures/tux/fire/fswim4.png
Binary file added data/images/creatures/tux/fire/fswim5.png
Binary file added data/images/creatures/tux/fire/fswimidle.png
Binary file added data/images/creatures/tux/fire/fswimup1.png
Binary file added data/images/creatures/tux/fire/fswimup2.png
Binary file added data/images/creatures/tux/fire/fswimup3.png
Binary file added data/images/creatures/tux/fire/fswimup4.png
Binary file added data/images/creatures/tux/fire/fswimup5.png
Binary file added data/images/creatures/tux/fire/sswim1.png
Binary file added data/images/creatures/tux/fire/sswim2.png
Binary file added data/images/creatures/tux/fire/sswim3.png
Binary file added data/images/creatures/tux/fire/sswim4.png
Binary file added data/images/creatures/tux/fire/sswim5.png
Binary file added data/images/creatures/tux/fire/sswimidle.png
Binary file added data/images/creatures/tux/fire/sswimup1.png
Binary file added data/images/creatures/tux/fire/sswimup2.png
Binary file added data/images/creatures/tux/fire/sswimup3.png
Binary file added data/images/creatures/tux/fire/sswimup4.png
Binary file added data/images/creatures/tux/fire/sswimup5.png
Binary file added data/images/creatures/tux/ice/iswim1.png
Binary file added data/images/creatures/tux/ice/iswim2.png
Binary file added data/images/creatures/tux/ice/iswim3.png
Binary file added data/images/creatures/tux/ice/iswim4.png
Binary file added data/images/creatures/tux/ice/iswim5.png
Binary file added data/images/creatures/tux/ice/iswimidle.png
Binary file added data/images/creatures/tux/ice/iswimup1.png
Binary file added data/images/creatures/tux/ice/iswimup2.png
Binary file added data/images/creatures/tux/ice/iswimup3.png
Binary file added data/images/creatures/tux/ice/iswimup4.png
Binary file added data/images/creatures/tux/ice/iswimup5.png
10 changes: 10 additions & 0 deletions data/images/creatures/tux/light.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@
(name "earth-jump-left")
(hitbox 516 134 32 64)
(mirror-action "earth-jump-right"))

(action
(name "earth-fall-right")
(hitbox 516 134 32 64)
(images "earth/light/stand.png"))

(action
(name "earth-fall-left")
(hitbox 516 134 32 64)
(mirror-action "earth-jump-right"))

(action
(name "earth-skid-right")
Expand Down
54 changes: 54 additions & 0 deletions data/images/creatures/tux/powerups.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@
(hitbox 16 15 32 64)
(mirror-action "fire-jump-right"))

(action
(name "fire-fall-right")
(hitbox 16 15 32 64)
(images "fire/hat/stand.png"))

(action
(name "fire-fall-left")
(hitbox 16 15 32 64)
(mirror-action "fire-jump-right"))

(action
(name "fire-skid-right")
(hitbox 16 15 32 64)
Expand Down Expand Up @@ -169,6 +179,16 @@
(hitbox 16 15 32 64)
(mirror-action "ice-jump-right"))

(action
(name "ice-fall-right")
(hitbox 16 15 32 64)
(images "ice/hat/stand.png"))

(action
(name "ice-fall-left")
(hitbox 16 15 32 64)
(mirror-action "ice-jump-right"))

(action
(name "ice-skid-right")
(hitbox 16 15 32 64)
Expand Down Expand Up @@ -296,6 +316,20 @@
(action
(name "air-jump-left")
(hitbox 16 15 32 64)
(mirror-action "air-jump-right"))

(action
(name "air-fall-right")
(fps 10)
(hitbox 16 15 32 64)
(images "air/hat/spin-0.png"
"air/hat/spin-1.png"
"air/hat/spin-2.png"
"air/hat/spin-1.png"))

(action
(name "air-fall-left")
(hitbox 16 15 32 64)
(mirror-action "air-jump-right"))

(action
Expand Down Expand Up @@ -426,6 +460,16 @@
(name "earth-jump-left")
(hitbox 16 15 32 64)
(mirror-action "earth-jump-right"))

(action
(name "earth-fall-right")
(hitbox 16 15 32 64)
(images "earth/hardhat/stand.png"))

(action
(name "earth-fall-left")
(hitbox 16 15 32 64)
(mirror-action "earth-jump-right"))

(action
(name "earth-skid-right")
Expand Down Expand Up @@ -550,6 +594,16 @@
(action
(name "santa-jump-left")
(hitbox 16 15 32 64)
(mirror-action "santa-jump-right"))

(action
(name "santa-fall-right")
(hitbox 16 15 32 64)
(images "fire/santa_cap/stand.png"))

(action
(name "santa-fall-left")
(hitbox 16 15 32 64)
(mirror-action "santa-jump-right"))

(action
Expand Down
Binary file added data/images/creatures/tux/small/sidegrow1.png
Binary file added data/images/creatures/tux/small/sidegrow2.png
Binary file added data/images/creatures/tux/small/sidegrow3.png
Binary file added data/images/creatures/tux/small/sidegrow4.png
Binary file added data/images/creatures/tux/small/sidegrow5.png
Binary file added data/images/creatures/tux/small/sidegrow6.png
Binary file added data/images/creatures/tux/small/swimsmall1.png
Binary file added data/images/creatures/tux/small/swimsmall2.png
Binary file added data/images/creatures/tux/small/swimsmall3.png
Binary file added data/images/creatures/tux/small/swimsmall4.png
Binary file added data/images/creatures/tux/small/swimsmall5.png
Binary file added data/images/creatures/tux/small/swimsmallup1.png
Binary file added data/images/creatures/tux/small/swimsmallup2.png
Binary file added data/images/creatures/tux/small/swimsmallup3.png
Binary file added data/images/creatures/tux/small/swimsmallup4.png
Binary file added data/images/creatures/tux/small/swimsmallup5.png
Loading

0 comments on commit 6f938bc

Please sign in to comment.