summaryrefslogtreecommitdiff
path: root/graphics/sprites
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-03-05 22:33:09 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-03-05 22:33:09 +0000
commitd706904d6b47ab330eb143266908456b1588dfc1 (patch)
tree4dc7b1638c1d6b1057c1783123bd984767f8729a /graphics/sprites
parent0585b14b682234ab5fad90185386a9d9cfb3be04 (diff)
downloadclientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.gz
clientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.bz2
clientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.xz
clientdata-d706904d6b47ab330eb143266908456b1588dfc1.zip
Merged new_playerset branch into trunk.
Diffstat (limited to 'graphics/sprites')
-rw-r--r--graphics/sprites/Makefile.am10
-rw-r--r--graphics/sprites/hairstyle1.pngbin0 -> 65948 bytes
-rw-r--r--graphics/sprites/hairstyle2.pngbin0 -> 59611 bytes
-rw-r--r--graphics/sprites/hairstyle3.pngbin0 -> 58910 bytes
-rw-r--r--graphics/sprites/hairstyle4.pngbin0 -> 51520 bytes
-rw-r--r--graphics/sprites/hairstyle5.pngbin0 -> 28182 bytes
-rw-r--r--graphics/sprites/hairstyle6.pngbin0 -> 18795 bytes
-rw-r--r--graphics/sprites/monster9.pngbin15443 -> 23571 bytes
-rw-r--r--graphics/sprites/player_male_base.pngbin23867 -> 57667 bytes
-rw-r--r--graphics/sprites/player_male_hair.pngbin39811 -> 0 bytes
-rw-r--r--graphics/sprites/weapon0.pngbin0 -> 2016 bytes
-rw-r--r--graphics/sprites/weapon1.pngbin0 -> 5751 bytes
-rw-r--r--graphics/sprites/weapons.pngbin13790 -> 0 bytes
13 files changed, 8 insertions, 2 deletions
diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am
index d95c233c..0cd882ff 100644
--- a/graphics/sprites/Makefile.am
+++ b/graphics/sprites/Makefile.am
@@ -3,6 +3,12 @@ spritesdir = $(pkgdatadir)/data/graphics/sprites
sprites_DATA = \
emotions.png \
+ hairstyle1.png \
+ hairstyle2.png \
+ hairstyle3.png \
+ hairstyle4.png \
+ hairstyle5.png \
+ hairstyle6.png \
items.png \
monster0.png \
monster1.png \
@@ -21,8 +27,8 @@ sprites_DATA = \
monster14.png \
npcs.png \
player_male_base.png \
- player_male_hair.png \
- weapons.png
+ weapon0.png \
+ weapon1.png
EXTRA_DIST = \
$(sprites_DATA)
diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png
new file mode 100644
index 00000000..b852b9db
--- /dev/null
+++ b/graphics/sprites/hairstyle1.png
Binary files differ
diff --git a/graphics/sprites/hairstyle2.png b/graphics/sprites/hairstyle2.png
new file mode 100644
index 00000000..2abe8eb0
--- /dev/null
+++ b/graphics/sprites/hairstyle2.png
Binary files differ
diff --git a/graphics/sprites/hairstyle3.png b/graphics/sprites/hairstyle3.png
new file mode 100644
index 00000000..caf78028
--- /dev/null
+++ b/graphics/sprites/hairstyle3.png
Binary files differ
diff --git a/graphics/sprites/hairstyle4.png b/graphics/sprites/hairstyle4.png
new file mode 100644
index 00000000..9582e7c4
--- /dev/null
+++ b/graphics/sprites/hairstyle4.png
Binary files differ
diff --git a/graphics/sprites/hairstyle5.png b/graphics/sprites/hairstyle5.png
new file mode 100644
index 00000000..f3ea6c2b
--- /dev/null
+++ b/graphics/sprites/hairstyle5.png
Binary files differ
diff --git a/graphics/sprites/hairstyle6.png b/graphics/sprites/hairstyle6.png
new file mode 100644
index 00000000..0df1cb45
--- /dev/null
+++ b/graphics/sprites/hairstyle6.png
Binary files differ
diff --git a/graphics/sprites/monster9.png b/graphics/sprites/monster9.png
index 4353c5a8..1a7ee2a8 100644
--- a/graphics/sprites/monster9.png
+++ b/graphics/sprites/monster9.png
Binary files differ
diff --git a/graphics/sprites/player_male_base.png b/graphics/sprites/player_male_base.png
index 3d2c5abd..8449c124 100644
--- a/graphics/sprites/player_male_base.png
+++ b/graphics/sprites/player_male_base.png
Binary files differ
diff --git a/graphics/sprites/player_male_hair.png b/graphics/sprites/player_male_hair.png
deleted file mode 100644
index 4e2ad5e4..00000000
--- a/graphics/sprites/player_male_hair.png
+++ /dev/null
Binary files differ
diff --git a/graphics/sprites/weapon0.png b/graphics/sprites/weapon0.png
new file mode 100644
index 00000000..f691ef3f
--- /dev/null
+++ b/graphics/sprites/weapon0.png
Binary files differ
diff --git a/graphics/sprites/weapon1.png b/graphics/sprites/weapon1.png
new file mode 100644
index 00000000..b5f8a68e
--- /dev/null
+++ b/graphics/sprites/weapon1.png
Binary files differ
diff --git a/graphics/sprites/weapons.png b/graphics/sprites/weapons.png
deleted file mode 100644
index 5365c39d..00000000
--- a/graphics/sprites/weapons.png
+++ /dev/null
Binary files differ