diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /data/graphics/sprites | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-stripped1.1.9.4.tar.gz plus-stripped1.1.9.4.tar.bz2 plus-stripped1.1.9.4.tar.xz plus-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'data/graphics/sprites')
| -rw-r--r-- | data/graphics/sprites/manaplus_emote.xml | 2 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotes.xml | 1 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotions.png | bin | 33162 -> 34648 bytes |
3 files changed, 2 insertions, 1 deletions
diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml index 55f5cc91f..8f27c4f83 100644 --- a/data/graphics/sprites/manaplus_emote.xml +++ b/data/graphics/sprites/manaplus_emote.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<sprite variants="24" variant_offset="1"> +<sprite variants="25" variant_offset="1"> <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> <action name="stand" imageset="base"> diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml index 9263c2d49..38628dc30 100644 --- a/data/graphics/sprites/manaplus_emotes.xml +++ b/data/graphics/sprites/manaplus_emotes.xml @@ -23,4 +23,5 @@ <emote id="121"><sprite name="Epic" variant="21">manaplus_emote.xml</sprite></emote> <emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote> <emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote> + <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote> </emotes> diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaplus_emotions.png Binary files differindex a3c29e164..c6f49ff29 100644 --- a/data/graphics/sprites/manaplus_emotions.png +++ b/data/graphics/sprites/manaplus_emotions.png |
