projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7d60c6
)
Added torch graphics
author
Ingo Ruhnke
<grumbel@gmail.com>
Wed, 8 Oct 2014 14:28:25 +0000
(16:28 +0200)
committer
Ingo Ruhnke
<grumbel@gmail.com>
Wed, 8 Oct 2014 14:28:25 +0000
(16:28 +0200)
18 files changed:
data/images/objects/torch/flame.sprite
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame1.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame2.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame3.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame4.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_glow.sprite
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_glow1.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_glow2.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_glow3.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_glow4.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_light.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/flame_light.sprite
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch1.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch1.sprite
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch2.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch2.sprite
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch3.png
[new file with mode: 0644]
patch
|
blob
data/images/objects/torch/torch3.sprite
[new file with mode: 0644]
patch
|
blob
diff --git a/data/images/objects/torch/flame.sprite
b/data/images/objects/torch/flame.sprite
new file mode 100644
(file)
index 0000000..
d46033f
--- /dev/null
+++ b/
data/images/objects/torch/flame.sprite
@@ -0,0
+1,12
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (fps 16)
+ (hitbox 14 128 0 0)
+ (images "flame1.png"
+ "flame2.png"
+ "flame3.png"
+ "flame4.png"
+ )
+ )
+)
diff --git a/data/images/objects/torch/flame1.png
b/data/images/objects/torch/flame1.png
new file mode 100644
(file)
index 0000000..
03ac803
Binary files /dev/null and b/data/images/objects/torch/flame1.png differ
diff --git a/data/images/objects/torch/flame2.png
b/data/images/objects/torch/flame2.png
new file mode 100644
(file)
index 0000000..
be81bcd
Binary files /dev/null and b/data/images/objects/torch/flame2.png differ
diff --git a/data/images/objects/torch/flame3.png
b/data/images/objects/torch/flame3.png
new file mode 100644
(file)
index 0000000..
897b44e
Binary files /dev/null and b/data/images/objects/torch/flame3.png differ
diff --git a/data/images/objects/torch/flame4.png
b/data/images/objects/torch/flame4.png
new file mode 100644
(file)
index 0000000..
bb8e549
Binary files /dev/null and b/data/images/objects/torch/flame4.png differ
diff --git a/data/images/objects/torch/flame_glow.sprite
b/data/images/objects/torch/flame_glow.sprite
new file mode 100644
(file)
index 0000000..
00352d7
--- /dev/null
+++ b/
data/images/objects/torch/flame_glow.sprite
@@ -0,0
+1,12
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (fps 16)
+ (hitbox 14 128 0 0)
+ (images "flame_glow1.png"
+ "flame_glow2.png"
+ "flame_glow3.png"
+ "flame_glow4.png"
+ )
+ )
+)
diff --git a/data/images/objects/torch/flame_glow1.png
b/data/images/objects/torch/flame_glow1.png
new file mode 100644
(file)
index 0000000..
c1d43da
Binary files /dev/null and b/data/images/objects/torch/flame_glow1.png differ
diff --git a/data/images/objects/torch/flame_glow2.png
b/data/images/objects/torch/flame_glow2.png
new file mode 100644
(file)
index 0000000..
9fc4b28
Binary files /dev/null and b/data/images/objects/torch/flame_glow2.png differ
diff --git a/data/images/objects/torch/flame_glow3.png
b/data/images/objects/torch/flame_glow3.png
new file mode 100644
(file)
index 0000000..
556c3c0
Binary files /dev/null and b/data/images/objects/torch/flame_glow3.png differ
diff --git a/data/images/objects/torch/flame_glow4.png
b/data/images/objects/torch/flame_glow4.png
new file mode 100644
(file)
index 0000000..
ce6ada0
Binary files /dev/null and b/data/images/objects/torch/flame_glow4.png differ
diff --git a/data/images/objects/torch/flame_light.png
b/data/images/objects/torch/flame_light.png
new file mode 100644
(file)
index 0000000..
50b50ad
Binary files /dev/null and b/data/images/objects/torch/flame_light.png differ
diff --git a/data/images/objects/torch/flame_light.sprite
b/data/images/objects/torch/flame_light.sprite
new file mode 100644
(file)
index 0000000..
eb39dc1
--- /dev/null
+++ b/
data/images/objects/torch/flame_light.sprite
@@ -0,0
+1,7
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (hitbox 384 384 0 0)
+ (images "flame_light.png")
+ )
+)
diff --git a/data/images/objects/torch/torch1.png
b/data/images/objects/torch/torch1.png
new file mode 100644
(file)
index 0000000..
590e71a
Binary files /dev/null and b/data/images/objects/torch/torch1.png differ
diff --git a/data/images/objects/torch/torch1.sprite
b/data/images/objects/torch/torch1.sprite
new file mode 100644
(file)
index 0000000..
6f41ab0
--- /dev/null
+++ b/
data/images/objects/torch/torch1.sprite
@@ -0,0
+1,7
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (hitbox 16 100 0 0)
+ (images "torch1.png")
+ )
+)
diff --git a/data/images/objects/torch/torch2.png
b/data/images/objects/torch/torch2.png
new file mode 100644
(file)
index 0000000..
d994732
Binary files /dev/null and b/data/images/objects/torch/torch2.png differ
diff --git a/data/images/objects/torch/torch2.sprite
b/data/images/objects/torch/torch2.sprite
new file mode 100644
(file)
index 0000000..
c6a17e9
--- /dev/null
+++ b/
data/images/objects/torch/torch2.sprite
@@ -0,0
+1,7
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (hitbox 16 100 0 0)
+ (images "torch2.png")
+ )
+)
diff --git a/data/images/objects/torch/torch3.png
b/data/images/objects/torch/torch3.png
new file mode 100644
(file)
index 0000000..
066eaa8
Binary files /dev/null and b/data/images/objects/torch/torch3.png differ
diff --git a/data/images/objects/torch/torch3.sprite
b/data/images/objects/torch/torch3.sprite
new file mode 100644
(file)
index 0000000..
4870809
--- /dev/null
+++ b/
data/images/objects/torch/torch3.sprite
@@ -0,0
+1,7
@@
+(supertux-sprite
+ (action
+ (name "default")
+ (hitbox 16 100 0 0)
+ (images "torch3.png")
+ )
+)