diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-03-05 22:33:09 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-03-05 22:33:09 +0000 |
| commit | d706904d6b47ab330eb143266908456b1588dfc1 (patch) | |
| tree | 4dc7b1638c1d6b1057c1783123bd984767f8729a | |
| parent | 0585b14b682234ab5fad90185386a9d9cfb3be04 (diff) | |
| download | clientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.gz clientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.bz2 clientdata-d706904d6b47ab330eb143266908456b1588dfc1.tar.xz clientdata-d706904d6b47ab330eb143266908456b1588dfc1.zip | |
Merged new_playerset branch into trunk.
| -rw-r--r-- | graphics/sprites/Makefile.am | 10 | ||||
| -rw-r--r-- | graphics/sprites/hairstyle1.png | bin | 0 -> 65948 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle2.png | bin | 0 -> 59611 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle3.png | bin | 0 -> 58910 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle4.png | bin | 0 -> 51520 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle5.png | bin | 0 -> 28182 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle6.png | bin | 0 -> 18795 bytes | |||
| -rw-r--r-- | graphics/sprites/monster9.png | bin | 15443 -> 23571 bytes | |||
| -rw-r--r-- | graphics/sprites/player_male_base.png | bin | 23867 -> 57667 bytes | |||
| -rw-r--r-- | graphics/sprites/player_male_hair.png | bin | 39811 -> 0 bytes | |||
| -rw-r--r-- | graphics/sprites/weapon0.png | bin | 0 -> 2016 bytes | |||
| -rw-r--r-- | graphics/sprites/weapon1.png | bin | 0 -> 5751 bytes | |||
| -rw-r--r-- | graphics/sprites/weapons.png | bin | 13790 -> 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 Binary files differnew file mode 100644 index 00000000..b852b9db --- /dev/null +++ b/graphics/sprites/hairstyle1.png diff --git a/graphics/sprites/hairstyle2.png b/graphics/sprites/hairstyle2.png Binary files differnew file mode 100644 index 00000000..2abe8eb0 --- /dev/null +++ b/graphics/sprites/hairstyle2.png diff --git a/graphics/sprites/hairstyle3.png b/graphics/sprites/hairstyle3.png Binary files differnew file mode 100644 index 00000000..caf78028 --- /dev/null +++ b/graphics/sprites/hairstyle3.png diff --git a/graphics/sprites/hairstyle4.png b/graphics/sprites/hairstyle4.png Binary files differnew file mode 100644 index 00000000..9582e7c4 --- /dev/null +++ b/graphics/sprites/hairstyle4.png diff --git a/graphics/sprites/hairstyle5.png b/graphics/sprites/hairstyle5.png Binary files differnew file mode 100644 index 00000000..f3ea6c2b --- /dev/null +++ b/graphics/sprites/hairstyle5.png diff --git a/graphics/sprites/hairstyle6.png b/graphics/sprites/hairstyle6.png Binary files differnew file mode 100644 index 00000000..0df1cb45 --- /dev/null +++ b/graphics/sprites/hairstyle6.png diff --git a/graphics/sprites/monster9.png b/graphics/sprites/monster9.png Binary files differindex 4353c5a8..1a7ee2a8 100644 --- a/graphics/sprites/monster9.png +++ b/graphics/sprites/monster9.png diff --git a/graphics/sprites/player_male_base.png b/graphics/sprites/player_male_base.png Binary files differindex 3d2c5abd..8449c124 100644 --- a/graphics/sprites/player_male_base.png +++ b/graphics/sprites/player_male_base.png diff --git a/graphics/sprites/player_male_hair.png b/graphics/sprites/player_male_hair.png Binary files differdeleted file mode 100644 index 4e2ad5e4..00000000 --- a/graphics/sprites/player_male_hair.png +++ /dev/null diff --git a/graphics/sprites/weapon0.png b/graphics/sprites/weapon0.png Binary files differnew file mode 100644 index 00000000..f691ef3f --- /dev/null +++ b/graphics/sprites/weapon0.png diff --git a/graphics/sprites/weapon1.png b/graphics/sprites/weapon1.png Binary files differnew file mode 100644 index 00000000..b5f8a68e --- /dev/null +++ b/graphics/sprites/weapon1.png diff --git a/graphics/sprites/weapons.png b/graphics/sprites/weapons.png Binary files differdeleted file mode 100644 index 5365c39d..00000000 --- a/graphics/sprites/weapons.png +++ /dev/null |
