projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e89eb5
)
Adding in the start of graphics and noise for the new backflip. These file are free...
author
Stephen Groundwater
<slacker@gluebox.com>
Thu, 29 Jun 2006 03:23:24 +0000
(
03:23
+0000)
committer
Stephen Groundwater
<slacker@gluebox.com>
Thu, 29 Jun 2006 03:23:24 +0000
(
03:23
+0000)
SVN-Revision: 3803
15 files changed:
data/images/creatures/tux_big/big-tux-arms.sprite
patch
|
blob
|
history
data/images/creatures/tux_big/big-tux-body.sprite
patch
|
blob
|
history
data/images/creatures/tux_big/big-tux-feet.sprite
patch
|
blob
|
history
data/images/creatures/tux_big/big-tux-head.sprite
patch
|
blob
|
history
data/images/creatures/tux_big/flip/empty.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_1.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_2.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_3.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_4.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_5.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_6.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_7.png
[new file with mode: 0644]
patch
|
blob
data/images/creatures/tux_big/flip/flip_8.png
[new file with mode: 0644]
patch
|
blob
data/sounds/flip.wav
[new file with mode: 0644]
patch
|
blob
src/object/player.cpp
patch
|
blob
|
history
diff --git
a/data/images/creatures/tux_big/big-tux-arms.sprite
b/data/images/creatures/tux_big/big-tux-arms.sprite
index
a8cb066
..
f09502d
100644
(file)
--- a/
data/images/creatures/tux_big/big-tux-arms.sprite
+++ b/
data/images/creatures/tux_big/big-tux-arms.sprite
@@
-74,7
+74,7
@@
(action
(name "backflip-right")
(hitbox 5 62 0 0)
- (images "
arms-duck-0
.png"))
+ (images "
flip/empty
.png"))
(action
(name "backflip-left")
diff --git
a/data/images/creatures/tux_big/big-tux-body.sprite
b/data/images/creatures/tux_big/big-tux-body.sprite
index
9146a17
..
c89bf9c
100644
(file)
--- a/
data/images/creatures/tux_big/big-tux-body.sprite
+++ b/
data/images/creatures/tux_big/big-tux-body.sprite
@@
-71,13
+71,24
@@
(action
(name "backflip-right")
- (fps
15
.0)
+ (fps
9
.0)
(hitbox 5 62 0 0)
- (images "body-duck-0.png"))
+ (images "flip/flip_1.png"
+"flip/flip_2.png"
+"flip/flip_3.png"
+"flip/flip_4.png"
+"flip/flip_5.png"
+"flip/flip_6.png"
+"flip/flip_1.png"
+"flip/flip_1.png"
+"flip/flip_1.png"
+"flip/flip_1.png"
+"flip/flip_1.png"
+))
(action
(name "backflip-left")
- (fps
15
.0)
+ (fps
9
.0)
(hitbox 27 62 0 0)
(mirror-action "backflip-right"))
diff --git
a/data/images/creatures/tux_big/big-tux-feet.sprite
b/data/images/creatures/tux_big/big-tux-feet.sprite
index
1018f54
..
d60a3e7
100644
(file)
--- a/
data/images/creatures/tux_big/big-tux-feet.sprite
+++ b/
data/images/creatures/tux_big/big-tux-feet.sprite
@@
-76,7
+76,7
@@
(name "backflip-right")
(fps 15.0)
(hitbox 5 62 0 0)
- (images "f
eet-duck-0
.png"))
+ (images "f
lip/empty
.png"))
(action
(name "backflip-left")
diff --git
a/data/images/creatures/tux_big/big-tux-head.sprite
b/data/images/creatures/tux_big/big-tux-head.sprite
index
ecec745
..
137710b
100644
(file)
--- a/
data/images/creatures/tux_big/big-tux-head.sprite
+++ b/
data/images/creatures/tux_big/big-tux-head.sprite
@@
-83,7
+83,7
@@
(name "backflip-right")
(fps 15.0)
(hitbox 5 62 0 0)
- (images "
head-duck-0
.png"))
+ (images "
flip/empty
.png"))
(action
(name "backflip-left")
diff --git a/data/images/creatures/tux_big/flip/empty.png
b/data/images/creatures/tux_big/flip/empty.png
new file mode 100644
(file)
index 0000000..
ad17df1
Binary files /dev/null and b/data/images/creatures/tux_big/flip/empty.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_1.png
b/data/images/creatures/tux_big/flip/flip_1.png
new file mode 100644
(file)
index 0000000..
4689602
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_1.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_2.png
b/data/images/creatures/tux_big/flip/flip_2.png
new file mode 100644
(file)
index 0000000..
3e51c21
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_2.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_3.png
b/data/images/creatures/tux_big/flip/flip_3.png
new file mode 100644
(file)
index 0000000..
bd30cbc
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_3.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_4.png
b/data/images/creatures/tux_big/flip/flip_4.png
new file mode 100644
(file)
index 0000000..
ea31589
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_4.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_5.png
b/data/images/creatures/tux_big/flip/flip_5.png
new file mode 100644
(file)
index 0000000..
4d3dc01
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_5.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_6.png
b/data/images/creatures/tux_big/flip/flip_6.png
new file mode 100644
(file)
index 0000000..
67b71b2
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_6.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_7.png
b/data/images/creatures/tux_big/flip/flip_7.png
new file mode 100644
(file)
index 0000000..
3669bb8
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_7.png differ
diff --git a/data/images/creatures/tux_big/flip/flip_8.png
b/data/images/creatures/tux_big/flip/flip_8.png
new file mode 100644
(file)
index 0000000..
45fd7ac
Binary files /dev/null and b/data/images/creatures/tux_big/flip/flip_8.png differ
diff --git a/data/sounds/flip.wav
b/data/sounds/flip.wav
new file mode 100644
(file)
index 0000000..
05bff18
Binary files /dev/null and b/data/sounds/flip.wav differ
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
29390d9
..
ebed28a
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-117,6
+117,7
@@
Player::Player(PlayerStatus* _player_status)
sound_manager->preload("sounds/jump.wav");
sound_manager->preload("sounds/hurt.wav");
sound_manager->preload("sounds/skid.wav");
+ sound_manager->preload("sounds/flip.wav");
init();
}
@@
-491,6
+492,7
@@
Player::do_backflip() {
backflip_direction = (dir == LEFT)?(+1):(-1);
backflipping = true;
do_jump(-580);
+ sound_manager->play("sounds/flip.wav");
backflip_timer.start(0.15);
}