diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 19:03:36 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 19:03:36 +0100 |
| commit | 082602abeed3ac6d29e1eb549aa184d72e488324 (patch) | |
| tree | 1fa5f2df11a88c01f8bcff3e2519bcb27d021c8e /graphics | |
| parent | e655116a364f646e849322c4fbc61fc77f30e4ac (diff) | |
| parent | d7ba1c6f83f543f5d1255beb520eb16da9930894 (diff) | |
| download | clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.gz clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.bz2 clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.xz clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.zip | |
Merge branch 'easter'
Conflicts:
items.xml
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/items/equipment/head/eggshell-hat.png | bin | 590 -> 435 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/head/eggshell.png | bin | 2156 -> 1549 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/head/eggshell.xml | 2 | ||||
| -rw-r--r-- | graphics/sprites/npcs/npc-annualeaster.png | bin | 0 -> 764 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/npc-annualeaster.xml | 9 |
5 files changed, 10 insertions, 1 deletions
diff --git a/graphics/items/equipment/head/eggshell-hat.png b/graphics/items/equipment/head/eggshell-hat.png Binary files differindex a23ef84d..882d9d3a 100644 --- a/graphics/items/equipment/head/eggshell-hat.png +++ b/graphics/items/equipment/head/eggshell-hat.png diff --git a/graphics/sprites/equipment/head/eggshell.png b/graphics/sprites/equipment/head/eggshell.png Binary files differindex 1c66d53a..067c5994 100644 --- a/graphics/sprites/equipment/head/eggshell.png +++ b/graphics/sprites/equipment/head/eggshell.png diff --git a/graphics/sprites/equipment/head/eggshell.xml b/graphics/sprites/equipment/head/eggshell.xml index 3685a4ff..b8c63a5c 100644 --- a/graphics/sprites/equipment/head/eggshell.xml +++ b/graphics/sprites/equipment/head/eggshell.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/equipment/head/eggshell.png" width="40" height="40"/> + <imageset name="base" src="graphics/sprites/equipment/head/eggshell.png|W" width="40" height="40"/> <action name="stand" imageset="base"> <animation direction="down"> <frame index="0" offsetX="0" offsetY="-29"/> diff --git a/graphics/sprites/npcs/npc-annualeaster.png b/graphics/sprites/npcs/npc-annualeaster.png Binary files differnew file mode 100644 index 00000000..ec3e6fd4 --- /dev/null +++ b/graphics/sprites/npcs/npc-annualeaster.png diff --git a/graphics/sprites/npcs/npc-annualeaster.xml b/graphics/sprites/npcs/npc-annualeaster.xml new file mode 100644 index 00000000..3f396423 --- /dev/null +++ b/graphics/sprites/npcs/npc-annualeaster.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/npc-annualeaster.png" width="32" height="32"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> |
