summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2018-11-09 16:27:21 +0000
committerMicksha <ms-shaman@gmx.de>2018-11-09 16:27:21 +0000
commit41d42ae03776dfec3bea52caccd91a2ac3736059 (patch)
treec13a77702776e6525fc9e1632dd5f53d2c20d562
parent6ff785721efffea2ff604a1a6942df56ca82b3c6 (diff)
parent890765b2f860d8b40f4ced5b092ed3afd8f12d4b (diff)
downloadclientdata-41d42ae03776dfec3bea52caccd91a2ac3736059.tar.gz
clientdata-41d42ae03776dfec3bea52caccd91a2ac3736059.tar.bz2
clientdata-41d42ae03776dfec3bea52caccd91a2ac3736059.tar.xz
clientdata-41d42ae03776dfec3bea52caccd91a2ac3736059.zip
Merge branch 'sprites' into 'master'
Sprites See merge request evol/clientdata!64
-rw-r--r--graphics/sprites/equipment/head/candlehelmet.xml4
-rw-r--r--graphics/sprites/equipment/head/headmodel-male.xml15
-rw-r--r--graphics/sprites/equipment/weapons/knife.xml1
3 files changed, 4 insertions, 16 deletions
diff --git a/graphics/sprites/equipment/head/candlehelmet.xml b/graphics/sprites/equipment/head/candlehelmet.xml
index fc982566..a995fb41 100644
--- a/graphics/sprites/equipment/head/candlehelmet.xml
+++ b/graphics/sprites/equipment/head/candlehelmet.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 TMW2 -->
<sprite>
<imageset name="base" src="graphics/sprites/equipment/head/candlehelmet.png" width="25" height="44"/>
<imageset name="base_dead" src="graphics/sprites/equipment/head/candlehelmet.png" width="50" height="44"/>
diff --git a/graphics/sprites/equipment/head/headmodel-male.xml b/graphics/sprites/equipment/head/headmodel-male.xml
index 144ac8dd..30f745e4 100644
--- a/graphics/sprites/equipment/head/headmodel-male.xml
+++ b/graphics/sprites/equipment/head/headmodel-male.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Saulc
+<!-- Author: Micksha, Saulc
Copyright (C) 2018 TMW2 -->
<sprite>
<imageset name="base"
src="graphics/sprites/equipment/head/headmodel-male.png"
width="32"
height="64"/>
-
<action name="stand" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-26"/>
@@ -50,7 +49,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="1" offsetY="-26" delay="80"/>
</animation>
</action>
-
<action name="attack" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
@@ -79,7 +77,6 @@ Copyright (C) 2018 TMW2 -->
<end />
</animation>
</action>
-
<action name="attack_bow" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-25" delay="240"/>
@@ -105,7 +102,6 @@ Copyright (C) 2018 TMW2 -->
<end />
</animation>
</action>
-
<action name="attack_wand" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
@@ -139,7 +135,6 @@ Copyright (C) 2018 TMW2 -->
<end />
</animation>
</action>
-
<action name="attack_scythe" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-25" delay="200"/>
@@ -181,7 +176,6 @@ Copyright (C) 2018 TMW2 -->
<end />
</animation>
</action>
-
<action name="attack_axe" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-24" delay="100"/>
@@ -202,7 +196,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="2" offsetX="-1" offsetY="-26" delay="200"/>
<frame index="2" offsetX="-2" offsetY="-24" delay="80"/>
<frame index="2" offsetX="-2" offsetY="-26" delay="130"/>
-
<end />
</animation>
<animation direction="right">
@@ -214,7 +207,6 @@ Copyright (C) 2018 TMW2 -->
<end />
</animation>
</action>
-
<action name="sit" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-19"/>
@@ -229,7 +221,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="-5" offsetY="-17"/>
</animation>
</action>
-
<action name="sittop" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-14"/>
@@ -244,7 +235,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="-5" offsetY="-17"/>
</animation>
</action>
-
<action name="standride" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-14"/>
@@ -259,7 +249,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="-5" offsetY="-17"/>
</animation>
</action>
-
<action name="spawnride" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-14"/>
@@ -274,7 +263,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="-7" offsetY="-17"/>
</animation>
</action>
-
<action name="ride" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-14"/>
@@ -289,7 +277,6 @@ Copyright (C) 2018 TMW2 -->
<frame index="3" offsetX="-5" offsetY="-17"/>
</animation>
</action>
-
<action name="dead" imageset="base">
<animation direction="default">
<frame index="4" offsetX="13" offsetY="8"/>
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 65852d3c..61488530 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -177,7 +177,6 @@ Copyright (C) 2012-2013 Evol Online -->
<frame index="42" delay="80"/>
<frame index="41" delay="80"/>
<frame index="40" delay="50"/>
-
<end />
</animation>
<animation direction="right">