diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-04-25 11:45:35 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-04-25 11:45:35 +0200 |
| commit | c1ae2b44a1d38cbbeccf17a4a1fcc1944129662c (patch) | |
| tree | 9a546f0634ea4da29a58d0626ce1479602ca3eea | |
| parent | fc6a091c20ee99acfd5349d876ac2c55b14b5c9b (diff) | |
| parent | 0de5a89c7436ed759d2f8e1b26e117ae283d73f9 (diff) | |
| download | clientdata-c1ae2b44a1d38cbbeccf17a4a1fcc1944129662c.tar.gz clientdata-c1ae2b44a1d38cbbeccf17a4a1fcc1944129662c.tar.bz2 clientdata-c1ae2b44a1d38cbbeccf17a4a1fcc1944129662c.tar.xz clientdata-c1ae2b44a1d38cbbeccf17a4a1fcc1944129662c.zip | |
Merge remote-tracking branch 'mainline/master'
| -rw-r--r-- | graphics/sprites/hairstyle1.png | bin | 1893 -> 4659 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle1.xml | 2 | ||||
| -rw-r--r-- | graphics/sprites/hairstyle16.png | bin | 2302 -> 4571 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle18.png | bin | 0 -> 2021 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyle18.xml | 8 | ||||
| -rw-r--r-- | items.xml | 3 |
6 files changed, 12 insertions, 1 deletions
diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png Binary files differindex 8c16d68e..7933cca5 100644 --- a/graphics/sprites/hairstyle1.png +++ b/graphics/sprites/hairstyle1.png diff --git a/graphics/sprites/hairstyle1.xml b/graphics/sprites/hairstyle1.xml index 45b21352..43ac77d6 100644 --- a/graphics/sprites/hairstyle1.xml +++ b/graphics/sprites/hairstyle1.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/hairstyle1.png|M" width="40" height="40" /> + <imageset name="base" src="graphics/sprites/hairstyle1.png|W" width="40" height="40" /> <action name="stand" imageset="base"> <animation direction="down"> diff --git a/graphics/sprites/hairstyle16.png b/graphics/sprites/hairstyle16.png Binary files differindex fc13907b..97dfc567 100644 --- a/graphics/sprites/hairstyle16.png +++ b/graphics/sprites/hairstyle16.png diff --git a/graphics/sprites/hairstyle18.png b/graphics/sprites/hairstyle18.png Binary files differnew file mode 100644 index 00000000..6b6e51b1 --- /dev/null +++ b/graphics/sprites/hairstyle18.png diff --git a/graphics/sprites/hairstyle18.xml b/graphics/sprites/hairstyle18.xml new file mode 100644 index 00000000..42d15556 --- /dev/null +++ b/graphics/sprites/hairstyle18.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<sprite> + + <imageset name="base" src="graphics/sprites/hairstyle18.png|W" width="40" height="40" /> + + <include file="hairstyle1.xml"/> + +</sprite> @@ -63,6 +63,9 @@ <item id="-17" type="hairsprite" name="Shoulder length flick"> <sprite>hairstyle17.xml</sprite> </item> + <item id="-18" type="hairsprite" name="Fizzy"> + <sprite>hairstyle18.xml</sprite> + </item> <!-- Treating the base sprite as equipment too will be useful when we implement other playable races --> |
