diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/angrystone/angrystone.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/angrystone/angrystone.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/angrystone/angrystone.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/angrystone/angrystone.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -10,4 +10,8 @@ (action (hitbox 0 0 87.8 87.8) (name "attacking") - (images "attacking-0.png"))) + (images "attacking-0.png")) + (action + (hitbox 0 0 87.8 87.8) + (name "iced") + (images "frozen.png"))) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/angrystone/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/angrystone/frozen.png differ Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/dispenser/canon-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/dispenser/canon-frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/dispenser/dispenser.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/dispenser/dispenser.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/dispenser/dispenser.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/dispenser/dispenser.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -3,11 +3,21 @@ (name "dropper") (hitbox 0 0 64 24) (images "dropper.png")) + + (action + (name "dropper-iced") + (hitbox 0 0 64 24) + (images "dropper-frozen.png")) (action (name "working") (hitbox 3 5 32 60) (images "canon.png")) + + (action + (name "iced") + (hitbox 3 5 32 60) + (images "canon-frozen.png")) (action (name "working-left") @@ -18,6 +28,11 @@ (name "broken-left") (hitbox 5 12 55 40) (images "broken.png")) + + (action + (name "iced-left") + (hitbox 5 12 55 40) + (images "frozen.png")) (action (name "working-right") @@ -30,6 +45,11 @@ (mirror-action "broken-left")) (action + (name "iced-right") + (hitbox 4 12 55 40) + (mirror-action "iced-left")) + + (action (name "swivel-left") (hitbox 5 12 55 40) (images "swivel-right.png" Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/dispenser/dropper-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/dispenser/dropper-frozen.png differ Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/dispenser/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/dispenser/frozen.png differ Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/igel/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/igel/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/igel/igel.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/igel/igel.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/igel/igel.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/igel/igel.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -9,8 +9,18 @@ ) ) (action + (name "iced-left") + (hitbox 2.1 6.1 45.8 25.8) + (images "frozen.png") + ) + (action (name "walking-right") (hitbox 2.1 6.1 45.8 25.8) (mirror-action "walking-left") ) + (action + (name "iced-right") + (hitbox 2.1 6.1 45.8 25.8) + (mirror-action "iced-left") + ) ) diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/mr_tree.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/mr_tree.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/mr_tree.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/mr_tree.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -13,7 +13,17 @@ ) (action (hitbox 0 -2 84.8 84.8) + (name "iced-left") + (images "walk-frozen.png") + ) + (action + (hitbox 0 -2 84.8 84.8) (name "right") (mirror-action "left") ) + (action + (hitbox 0 -2 84.8 84.8) + (name "iced-right") + (mirror-action "iced-left") + ) ) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/small-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/small-frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/stumpy.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/stumpy.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/stumpy.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/stumpy.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -18,6 +18,16 @@ ) (action (hitbox 20 23 42 62) + (name "iced-left") + (images "small-frozen.png") + ) + (action + (hitbox 20 23 42 62) + (name "iced-right") + (mirror-action "iced-left") + ) + (action + (hitbox 20 23 42 62) (name "dizzy-left") (images "dizzy-0.png" Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/mr_tree/walk-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/mr_tree/walk-frozen.png differ Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/plant/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/plant/frozen.png differ Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/plant/iced-left.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/plant/iced-left.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/plant/plant.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/plant/plant.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/plant/plant.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/plant/plant.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -12,7 +12,7 @@ (action (name "iced-left") (hitbox 6 10 31.8 31.8) - (images "iced-left.png")) + (images "frozen.png")) (action (name "iced-right") (hitbox 6 10 31.8 31.8) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/poison_ivy/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/poison_ivy/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/poison_ivy/poison_ivy.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/poison_ivy/poison_ivy.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/poison_ivy/poison_ivy.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/poison_ivy/poison_ivy.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -5,12 +5,19 @@ (images "left-0.png" "left-1.png" "left-2.png")) - (action (name "right") (hitbox 2 4 31.8 31.8) (mirror-action "left")) (action + (name "iced-left") + (hitbox 2 4 31.8 31.8) + (images "frozen.png")) + (action + (name "iced-right") + (hitbox 2 4 31.8 31.8) + (mirror-action "iced-left")) + (action (name "squished-left") (hitbox 0 3 31.8 31.8) (images "squished.png")) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/skullyhop/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/skullyhop/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/skullyhop/skullyhop.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/skullyhop/skullyhop.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/skullyhop/skullyhop.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/skullyhop/skullyhop.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -8,6 +8,14 @@ (hitbox 0 0 33.8 43.8) (mirror-action "standing-left")) (action + (name "iced-left") + (hitbox 0 0 33.8 43.8) + (images "frozen.png")) + (action + (name "iced-right") + (hitbox 0 0 33.8 43.8) + (mirror-action "iced-left")) + (action (name "charging-left") (hitbox 0 0 33.8 43.8) (fps 10.0) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/snail/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/snail/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/snail/snail.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/snail/snail.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/snail/snail.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/snail/snail.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -10,6 +10,14 @@ (action (name "right") (hitbox 2 3 31.8 31.8) (mirror-action "left")) + (action + (name "iced-left") + (hitbox 2 3 31.8 31.8) + (images "frozen.png")) + + (action (name "iced-right") + (hitbox 2 3 31.8 31.8) + (mirror-action "iced-left")) (action (name "flat-left") (fps 64.0) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite-frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/spidermite/spidermite.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -18,4 +18,12 @@ (action (name "squished-right") (hitbox 4 3 31.8 31.8) - (mirror-action "squished-left"))) + (mirror-action "squished-left")) + (action + (name "iced-left") + (hitbox 4 3 31.8 31.8) + (images "spidermite-frozen.png")) + (action + (name "iced-right") + (hitbox 4 3 31.8 31.8) + (mirror-action "iced-left"))) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/toad/toad-frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/toad/toad-frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/toad/toad.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/toad/toad.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/toad/toad.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/toad/toad.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -14,6 +14,17 @@ (mirror-action "idle-left") ) (action + (name "iced-left") + (hitbox 1 1 40 24) + (fps 5.0) + (images "toad-frozen.png") + ) + (action + (name "iced-right") + (hitbox 1 1 40 24) + (mirror-action "iced-left") + ) + (action (name "jumping-left") (hitbox 1 1 40 24) (images Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/walkingleaf/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/walkingleaf/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/walkingleaf/walkingleaf.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/walkingleaf/walkingleaf.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/walkingleaf/walkingleaf.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/walkingleaf/walkingleaf.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -11,6 +11,14 @@ (hitbox 2 4 31.8 31.8) (mirror-action "left")) (action + (name "iced-left") + (hitbox 2 4 31.8 31.8) + (images "frozen.png")) + (action + (name "iced-right") + (hitbox 2 4 31.8 31.8) + (mirror-action "iced-left")) + (action (name "squished-left") (hitbox 0 3 31.8 31.8) (images "squished.png")) Binary files /tmp/hc4SIJEsTE/supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/zeekling/frozen.png and /tmp/3xKzMa7L74/supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/zeekling/frozen.png differ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/zeekling/zeekling.sprite supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/zeekling/zeekling.sprite --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/images/creatures/zeekling/zeekling.sprite 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/images/creatures/zeekling/zeekling.sprite 2015-07-28 16:31:21.000000000 +0000 @@ -12,6 +12,14 @@ (hitbox 25 19 31 30) (mirror-action "left")) (action + (name "iced-left") + (hitbox 8 19 31 30) + (images "frozen.png")) + (action + (name "iced-right") + (hitbox 25 19 31 30) + (mirror-action "iced-left")) + (action (name "squished-left") (hitbox 8 19 31 30) (images "squished.png")) diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/levels/test/freezetest.stl supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/levels/test/freezetest.stl --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/levels/test/freezetest.stl 1970-01-01 00:00:00.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/levels/test/freezetest.stl 2015-07-28 16:31:21.000000000 +0000 @@ -0,0 +1,110 @@ +(supertux-level + (version 2) + (name (_ "Freezing test")) + (author "Hume") + (license "GPL 2+ / CC-by-sa 3.0") + (target-time 0) + (sector + (name "main") + (ambient-light 1 1 1) + (angrystone + (x 1376) + (y 192) + ) + (angrystone + (x 1152) + (y 576) + ) + (camera + (mode "normal") + ) + (climbable + (width 32) + (height 360) + (x 1504) + (y 148) + ) + (dispenser + (cycle 5) + (random #t) + (badguy "mrtree" "stumpy" "zeekling" "snail" "igel" "toad" "skullyhop") + (x 864) + (y 192) + ) + (dispenser + (cycle 5) + (type "rocketlauncher") + (badguy "poisonivy") + (x 325) + (y 652) + ) + (dispenser + (cycle 5) + (type "cannon") + (badguy "walkingleaf") + (x 672) + (y 640) + ) + (mole + (x 1395) + (y 448) + ) + (mrtree + (x 448) + (y 606) + ) + (spawnpoint + (name "main") + (x 96) + (y 96) + ) + (spidermite + (x 484) + (y 131) + ) + (tilemap + (solid #t) + (z-pos 0) + (name "Interactive") + (width 50) + (height 35) + (tiles + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2047 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 48 2048 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 48 2048 0 0 + 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 48 2048 0 0 + 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 2048 0 0 + 0 48 48 48 0 0 140 140 140 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 2048 0 0 + 0 0 48 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 2048 0 0 + 0 0 48 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 2048 0 0 + 0 0 48 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 2048 0 0 + 0 48 48 0 48 48 48 48 48 48 48 48 48 48 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 2049 0 0 + 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 48 48 48 48 + 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 + 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 + 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 + 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 + 0 0 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 + 0 0 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 0 0 0 + 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + ) + ) + ) +) diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/levels/world1/01 - Welcome to Antarctica.stl supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/levels/world1/01 - Welcome to Antarctica.stl --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/data/levels/world1/01 - Welcome to Antarctica.stl 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/data/levels/world1/01 - Welcome to Antarctica.stl 2015-07-28 16:31:21.000000000 +0000 @@ -78,7 +78,7 @@ (infoblock (message (_ "-Checkpoints !images/objects/resetpoints/bell-m.png -#Activate the checkpoint. If you die, you can retry the level from here. Every time you retry from a checkpoint, you will lose at least 25 coins.")) +#Activate the checkpoint. If you die, you can retry the level from here. Every time you retry from a checkpoint, you will lose 10 percent of your coins (at least 25 coins).")) (x 5360) (y 864) ) diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/debian/bzr-builder.manifest supertux-0.3.5~git20150728+4~ubuntu15.10.1/debian/bzr-builder.manifest --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/debian/bzr-builder.manifest 2015-07-27 16:32:03.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/debian/bzr-builder.manifest 2015-07-28 16:31:41.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}20150727+4 -lp:~supertux-dev/supertux/master revid:git-v1:0dbc50bdb58cb4925ada1fd2dee7d51a9a160ea2 +# bzr-builder format 0.3 deb-version {debupstream}20150728+4 +lp:~supertux-dev/supertux/master revid:git-v1:733729dcb01958a1a124031a871befbc0742263a merge packaging lp:~supertux-dev/supertux/supertux-debian-trunk revid:trldp@outlook.com-20140829193306-fxzor2d18e5dxi9g diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/debian/changelog supertux-0.3.5~git20150728+4~ubuntu15.10.1/debian/changelog --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/debian/changelog 2015-07-27 16:32:03.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/debian/changelog 2015-07-28 16:31:41.000000000 +0000 @@ -1,8 +1,8 @@ -supertux (0.3.5~git20150727+4~ubuntu15.10.1) wily; urgency=low +supertux (0.3.5~git20150728+4~ubuntu15.10.1) wily; urgency=low * Auto build. - -- Launchpad Package Builder Mon, 27 Jul 2015 16:32:03 +0000 + -- Launchpad Package Builder Tue, 28 Jul 2015 16:31:41 +0000 supertux (0.3.5~git-1) UNRELEASED; urgency=low diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/angrystone.cpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/angrystone.cpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/angrystone.cpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/angrystone.cpp 2015-07-28 16:31:21.000000000 +0000 @@ -80,6 +80,10 @@ AngryStone::active_update(float elapsed_time) { BadGuy::active_update(elapsed_time); + if (frozen) { + return; + } + if (state == IDLE) { MovingObject* player = this->get_nearest_player(); if(player) { @@ -163,4 +167,10 @@ } +bool +AngryStone::is_freezable() const +{ + return state != ATTACKING; +} + /* EOF */ diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/angrystone.hpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/angrystone.hpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/angrystone.hpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/angrystone.hpp 2015-07-28 16:31:21.000000000 +0000 @@ -28,6 +28,7 @@ HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void active_update(float elapsed_time); void kill_fall(); + bool is_freezable() const; protected: enum AngryStoneState { diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/badguy.cpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/badguy.cpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/badguy.cpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/badguy.cpp 2015-07-28 16:31:21.000000000 +0000 @@ -595,11 +595,17 @@ if(sprite->has_action("iced-left")) sprite->set_action(dir == LEFT ? "iced-left" : "iced-right", 1); - // when no iced action exists, default to shading badguy blue + // when the sprite doesn't have separate actions for left and right, it tries to use an universal one. else { - sprite->set_color(Color(0.60, 0.72, 0.88f)); - sprite->stop_animation(); + if(sprite->has_action("iced")) + sprite->set_action("iced", 1); + // when no iced action exists, default to shading badguy blue + else + { + sprite->set_color(Color(0.60, 0.72, 0.88f)); + sprite->stop_animation(); + } } } @@ -610,7 +616,7 @@ frozen = false; // restore original color if needed - if(!sprite->has_action("iced-left")) + if((!sprite->has_action("iced-left")) && (!sprite->has_action("iced")) ) { sprite->set_color(Color(1.00, 1.00, 1.00f)); sprite->set_animation_loops(); diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/dispenser.cpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/dispenser.cpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/dispenser.cpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/dispenser.cpp 2015-07-28 16:31:21.000000000 +0000 @@ -250,14 +250,49 @@ void Dispenser::freeze() { - BadGuy::freeze(); + set_group(COLGROUP_MOVING_STATIC); + frozen = true; + + if(type=="rocketlauncher" && sprite->has_action("iced-left")) + // Only swivel dispensers can use their left/right iced actions. + sprite->set_action(dir == LEFT ? "iced-left" : "iced-right", 1); + // when the sprite doesn't have separate actions for left and right or isn't a rocketlauncher, + // it tries to use an universal one. + else + { + if(type=="cannon" && sprite->has_action("iced")) + sprite->set_action("iced", 1); + // When is the dispenser a cannon, it uses the "iced" action. + else + { + if(sprite->has_action("dropper-iced")) + sprite->set_action("dropper-iced", 1); + // When is the dispenser a dropper, it uses the "dropper-iced". + else + { + sprite->set_color(Color(0.60, 0.72, 0.88f)); + sprite->stop_animation(); + // When is the dispenser something else (unprobable), or has no matching iced sprite, it shades to blue. + } + } + } dispense_timer.stop(); } void Dispenser::unfreeze() { - BadGuy::unfreeze(); + set_group(colgroup_active); + frozen = false; + + // restore original color if needed + if(((!sprite->has_action("iced-left") && type=="rocketlauncher") + || (!sprite->has_action("iced") && type=="cannon")) + && (!sprite->has_action("dropper-iced")) ) + { + sprite->set_color(Color(1.00, 1.00, 1.00f)); + sprite->set_animation_loops(); + } activate(); } diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/dispenser.hpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/dispenser.hpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/dispenser.hpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/dispenser.hpp 2015-07-28 16:31:21.000000000 +0000 @@ -38,6 +38,10 @@ void launch_badguy(); private: + + /** CollisionGroup the badguy should be in while active */ + CollisionGroup colgroup_active; + float cycle; std::vector badguys; unsigned int next_badguy; diff -Nru supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/mrtree.cpp supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/mrtree.cpp --- supertux-0.3.5~git20150727+4~ubuntu15.10.1/src/badguy/mrtree.cpp 2015-07-27 16:31:30.000000000 +0000 +++ supertux-0.3.5~git20150728+4~ubuntu15.10.1/src/badguy/mrtree.cpp 2015-07-28 16:31:21.000000000 +0000 @@ -80,24 +80,25 @@ LAYER_OBJECTS-1)); } - // spawn PoisonIvy - Vector leaf1_pos(stumpy_pos.x - POISONIVY_WIDTH - 1, stumpy_pos.y - POISONIVY_Y_OFFSET); - Rectf leaf1_bbox(leaf1_pos.x, leaf1_pos.y, leaf1_pos.x + POISONIVY_WIDTH, leaf1_pos.y + POISONIVY_HEIGHT); - if (Sector::current()->is_free_of_movingstatics(leaf1_bbox, this)) { - auto leaf1 = std::make_shared(leaf1_bbox.p1, LEFT); - leaf1->countMe = false; - Sector::current()->add_object(leaf1); - } + if (!frozen){ //Frozen Mr.Trees don't spawn any PoisonIvys. + // spawn PoisonIvy + Vector leaf1_pos(stumpy_pos.x - POISONIVY_WIDTH - 1, stumpy_pos.y - POISONIVY_Y_OFFSET); + Rectf leaf1_bbox(leaf1_pos.x, leaf1_pos.y, leaf1_pos.x + POISONIVY_WIDTH, leaf1_pos.y + POISONIVY_HEIGHT); + if (Sector::current()->is_free_of_movingstatics(leaf1_bbox, this)) { + auto leaf1 = std::make_shared(leaf1_bbox.p1, LEFT); + leaf1->countMe = false; + Sector::current()->add_object(leaf1); + } - // spawn PoisonIvy - Vector leaf2_pos(stumpy_pos.x + sprite->get_current_hitbox_width() + 1, stumpy_pos.y - POISONIVY_Y_OFFSET); - Rectf leaf2_bbox(leaf2_pos.x, leaf2_pos.y, leaf2_pos.x + POISONIVY_WIDTH, leaf2_pos.y + POISONIVY_HEIGHT); - if (Sector::current()->is_free_of_movingstatics(leaf2_bbox, this)) { - auto leaf2 = std::make_shared(leaf2_bbox.p1, RIGHT); - leaf2->countMe = false; - Sector::current()->add_object(leaf2); + // spawn PoisonIvy + Vector leaf2_pos(stumpy_pos.x + sprite->get_current_hitbox_width() + 1, stumpy_pos.y - POISONIVY_Y_OFFSET); + Rectf leaf2_bbox(leaf2_pos.x, leaf2_pos.y, leaf2_pos.x + POISONIVY_WIDTH, leaf2_pos.y + POISONIVY_HEIGHT); + if (Sector::current()->is_free_of_movingstatics(leaf2_bbox, this)) { + auto leaf2 = std::make_shared(leaf2_bbox.p1, RIGHT); + leaf2->countMe = false; + Sector::current()->add_object(leaf2); + } } - return true; }