diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:33:23 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:33:23 +0200 |
commit | d2923965d95fd00462937678945c9d0bacd9eb6b (patch) | |
tree | 52e8f50f9b23ca4f447ad9c56f32cb5ed9b8f547 /graphics/sprites | |
parent | ca927fd89c5b902f3a18ecae8b27899ac13cf16a (diff) | |
parent | a2fd108c1ca8cf389575eca833fc12c18d7e0975 (diff) | |
download | clientdata-d2923965d95fd00462937678945c9d0bacd9eb6b.tar.gz clientdata-d2923965d95fd00462937678945c9d0bacd9eb6b.tar.bz2 clientdata-d2923965d95fd00462937678945c9d0bacd9eb6b.tar.xz clientdata-d2923965d95fd00462937678945c9d0bacd9eb6b.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
items.xml
Diffstat (limited to 'graphics/sprites')
-rw-r--r-- | graphics/sprites/npcs/npc-weaver.png | bin | 0 -> 4246 bytes | |||
-rw-r--r-- | graphics/sprites/npcs/npc-weaver.xml | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/npc-weaver.png b/graphics/sprites/npcs/npc-weaver.png Binary files differnew file mode 100644 index 00000000..ada86e32 --- /dev/null +++ b/graphics/sprites/npcs/npc-weaver.png diff --git a/graphics/sprites/npcs/npc-weaver.xml b/graphics/sprites/npcs/npc-weaver.xml new file mode 100644 index 00000000..db0a0e66 --- /dev/null +++ b/graphics/sprites/npcs/npc-weaver.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/npc-weaver.png" width="64" height="61"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> |