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 | |
| 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')
| -rw-r--r-- | graphics/items/generic/silk-sheet.png | bin | 0 -> 1387 bytes | |||
| -rw-r--r-- | graphics/minimaps/015-1.png | bin | 38196 -> 36819 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/npc-weaver.png | bin | 0 -> 4246 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/npc-weaver.xml | 9 | ||||
| -rw-r--r-- | graphics/tiles/desert3.png | bin | 0 -> 92255 bytes | |||
| -rw-r--r-- | graphics/tiles/desert_x2.png | bin | 28154 -> 34342 bytes | |||
| -rw-r--r-- | graphics/tiles/woodland_indoor_x3.png | bin | 10786 -> 18708 bytes |
7 files changed, 9 insertions, 0 deletions
diff --git a/graphics/items/generic/silk-sheet.png b/graphics/items/generic/silk-sheet.png Binary files differnew file mode 100644 index 00000000..90a08422 --- /dev/null +++ b/graphics/items/generic/silk-sheet.png diff --git a/graphics/minimaps/015-1.png b/graphics/minimaps/015-1.png Binary files differindex 7c2481e5..0e482bdf 100644 --- a/graphics/minimaps/015-1.png +++ b/graphics/minimaps/015-1.png 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> diff --git a/graphics/tiles/desert3.png b/graphics/tiles/desert3.png Binary files differnew file mode 100644 index 00000000..b96ef982 --- /dev/null +++ b/graphics/tiles/desert3.png diff --git a/graphics/tiles/desert_x2.png b/graphics/tiles/desert_x2.png Binary files differindex 099862cf..23022f08 100644 --- a/graphics/tiles/desert_x2.png +++ b/graphics/tiles/desert_x2.png diff --git a/graphics/tiles/woodland_indoor_x3.png b/graphics/tiles/woodland_indoor_x3.png Binary files differindex 8fc993f5..601f6fa4 100644 --- a/graphics/tiles/woodland_indoor_x3.png +++ b/graphics/tiles/woodland_indoor_x3.png |
