diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
| commit | 9b8362e5767b9b0fb4251c16c80669b288f06648 (patch) | |
| tree | 4b78772e1b17ce69cd877f49edf3d2a31b4d9920 /graphics | |
| parent | bbed5a765c152fee8a4ed8adc78423d9737c4d46 (diff) | |
| parent | 5409675d5d3cba9f4a55ca6a783d038eb69f9ccc (diff) | |
| download | clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.gz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.bz2 clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.xz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
monsters.xml
Diffstat (limited to 'graphics')
48 files changed, 79 insertions, 0 deletions
diff --git a/graphics/minimaps/001-1.png b/graphics/minimaps/001-1.png Binary files differindex d64baa24..5a2a3daf 100644 --- a/graphics/minimaps/001-1.png +++ b/graphics/minimaps/001-1.png diff --git a/graphics/minimaps/001-3.png b/graphics/minimaps/001-3.png Binary files differindex 995652eb..2e59c631 100644 --- a/graphics/minimaps/001-3.png +++ b/graphics/minimaps/001-3.png diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png Binary files differindex a1677f34..56e6f236 100644 --- a/graphics/minimaps/002-1.png +++ b/graphics/minimaps/002-1.png diff --git a/graphics/minimaps/002-3.png b/graphics/minimaps/002-3.png Binary files differindex 8760cd9b..fb63ed9e 100644 --- a/graphics/minimaps/002-3.png +++ b/graphics/minimaps/002-3.png diff --git a/graphics/minimaps/002-4.png b/graphics/minimaps/002-4.png Binary files differindex 10d5a480..6eb8c024 100644 --- a/graphics/minimaps/002-4.png +++ b/graphics/minimaps/002-4.png diff --git a/graphics/minimaps/002-5.png b/graphics/minimaps/002-5.png Binary files differnew file mode 100644 index 00000000..4f8bff8b --- /dev/null +++ b/graphics/minimaps/002-5.png diff --git a/graphics/minimaps/003-1.png b/graphics/minimaps/003-1.png Binary files differindex 33da62a3..85918b96 100644 --- a/graphics/minimaps/003-1.png +++ b/graphics/minimaps/003-1.png diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png Binary files differindex 1be36074..f4e37cf1 100644 --- a/graphics/minimaps/004-1.png +++ b/graphics/minimaps/004-1.png diff --git a/graphics/minimaps/005-1.png b/graphics/minimaps/005-1.png Binary files differindex 658e55c3..7ee0e84c 100644 --- a/graphics/minimaps/005-1.png +++ b/graphics/minimaps/005-1.png diff --git a/graphics/minimaps/005-3.png b/graphics/minimaps/005-3.png Binary files differindex 6918a517..e3ff874f 100644 --- a/graphics/minimaps/005-3.png +++ b/graphics/minimaps/005-3.png diff --git a/graphics/minimaps/005-4.png b/graphics/minimaps/005-4.png Binary files differindex 4c66f084..52f3a6c5 100644 --- a/graphics/minimaps/005-4.png +++ b/graphics/minimaps/005-4.png diff --git a/graphics/minimaps/006-3.png b/graphics/minimaps/006-3.png Binary files differindex bc25fa50..b87577c4 100644 --- a/graphics/minimaps/006-3.png +++ b/graphics/minimaps/006-3.png diff --git a/graphics/minimaps/011-1.png b/graphics/minimaps/011-1.png Binary files differindex 0099b328..dbb31e8f 100644 --- a/graphics/minimaps/011-1.png +++ b/graphics/minimaps/011-1.png diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png Binary files differindex 54d5cca2..95682eb1 100644 --- a/graphics/minimaps/018-1.png +++ b/graphics/minimaps/018-1.png diff --git a/graphics/minimaps/021-1.png b/graphics/minimaps/021-1.png Binary files differindex 5332568a..dfa93050 100644 --- a/graphics/minimaps/021-1.png +++ b/graphics/minimaps/021-1.png diff --git a/graphics/minimaps/021-3.png b/graphics/minimaps/021-3.png Binary files differnew file mode 100644 index 00000000..d7c94027 --- /dev/null +++ b/graphics/minimaps/021-3.png diff --git a/graphics/minimaps/022-1.png b/graphics/minimaps/022-1.png Binary files differindex 25900973..211cd2e9 100644 --- a/graphics/minimaps/022-1.png +++ b/graphics/minimaps/022-1.png diff --git a/graphics/minimaps/024-1.png b/graphics/minimaps/024-1.png Binary files differindex 4f14647a..d2c43731 100644 --- a/graphics/minimaps/024-1.png +++ b/graphics/minimaps/024-1.png diff --git a/graphics/minimaps/024-3.png b/graphics/minimaps/024-3.png Binary files differindex 0fa2bb52..541e1f29 100644 --- a/graphics/minimaps/024-3.png +++ b/graphics/minimaps/024-3.png diff --git a/graphics/minimaps/024-4.png b/graphics/minimaps/024-4.png Binary files differindex 393af788..db28f57c 100644 --- a/graphics/minimaps/024-4.png +++ b/graphics/minimaps/024-4.png diff --git a/graphics/minimaps/031-1.png b/graphics/minimaps/031-1.png Binary files differindex 319437c0..79f046fb 100644 --- a/graphics/minimaps/031-1.png +++ b/graphics/minimaps/031-1.png diff --git a/graphics/minimaps/032-1.png b/graphics/minimaps/032-1.png Binary files differindex a9301bae..976440b0 100644 --- a/graphics/minimaps/032-1.png +++ b/graphics/minimaps/032-1.png diff --git a/graphics/minimaps/032-3.png b/graphics/minimaps/032-3.png Binary files differindex 12d488f7..9a5e09a6 100644 --- a/graphics/minimaps/032-3.png +++ b/graphics/minimaps/032-3.png diff --git a/graphics/minimaps/041-1.png b/graphics/minimaps/041-1.png Binary files differindex f6dd9189..5bbd4aaa 100644 --- a/graphics/minimaps/041-1.png +++ b/graphics/minimaps/041-1.png diff --git a/graphics/minimaps/042-1.png b/graphics/minimaps/042-1.png Binary files differindex 5b00bfa7..4e8b49c7 100644 --- a/graphics/minimaps/042-1.png +++ b/graphics/minimaps/042-1.png diff --git a/graphics/minimaps/043-1.png b/graphics/minimaps/043-1.png Binary files differnew file mode 100644 index 00000000..c9445e56 --- /dev/null +++ b/graphics/minimaps/043-1.png diff --git a/graphics/minimaps/043-3.png b/graphics/minimaps/043-3.png Binary files differnew file mode 100644 index 00000000..afe15052 --- /dev/null +++ b/graphics/minimaps/043-3.png diff --git a/graphics/particles/anibubble_8px.png b/graphics/particles/anibubble_8px.png Binary files differnew file mode 100644 index 00000000..49151502 --- /dev/null +++ b/graphics/particles/anibubble_8px.png diff --git a/graphics/particles/anibubble_8px_green.png b/graphics/particles/anibubble_8px_green.png Binary files differnew file mode 100644 index 00000000..46bafbb2 --- /dev/null +++ b/graphics/particles/anibubble_8px_green.png diff --git a/graphics/particles/monster-angry-fire-goblin.particle.xml b/graphics/particles/monster-angry-fire-goblin.particle.xml new file mode 100644 index 00000000..a02d7c5d --- /dev/null +++ b/graphics/particles/monster-angry-fire-goblin.particle.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- +A fire effect intended for use with the fire goblin mob +--> +<effect> + <particle position-x="0" position-y="0" position-z="0"> + <emitter> + <property name="position-x" min="-11" max="13"/> + <property name="position-y" min="-22" max="-26"/> + <property name="horizontal-angle" min="0" max="360"/> + <property name="vertical-angle" min="0" max="90"/> + <property name="power" min="0.1" max="0.3"/> + <property name="gravity" value="-0.03"/> + <animation imageset="graphics/particles/aniblaze.png" width="8" height="8"> + <sequence start="0" end="14" delay="20"/> + <frame index="14" delay="1000"/> + </animation> + <property name="lifetime" min="25" max="35"/> + <property name="output" min="0" max="7"/> + <property name="fade-in" value="0"/> + <property name="fade-out" value="5"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/monster-angry-green-slime.particle.xml b/graphics/particles/monster-angry-green-slime.particle.xml new file mode 100644 index 00000000..ed1d0f8c --- /dev/null +++ b/graphics/particles/monster-angry-green-slime.particle.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- +A bubble effect intended for use with the igreen slime mob. +--> +<effect> + <particle position-x="0" position-y="0" position-z="0"> + <emitter> + <property name="position-x" min="-7" max="7"/> + <property name="position-y" min="-14" max="-22"/> + <property name="horizontal-angle" min="0" max="360"/> + <property name="vertical-angle" min="0" max="90"/> + <property name="power" min="0.1" max="0.3"/> + <property name="gravity" value="-0.03"/> + <animation imageset="graphics/particles/anibubble_8px_green.png" width="8" height="8"> + <sequence start="0" end="14" delay="1000"/> + </animation> + <property name="lifetime" min="15" max="25"/> + <property name="output" min="0" max="7"/> + <property name="fade-in" value="0"/> + <property name="fade-out" value="5"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/monster-angry-sea-slime.particle.xml b/graphics/particles/monster-angry-sea-slime.particle.xml new file mode 100644 index 00000000..b5ae198e --- /dev/null +++ b/graphics/particles/monster-angry-sea-slime.particle.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- +A bubble effect intended for use with the sea slime mob. +--> +<effect> + <particle position-x="0" position-y="0" position-z="0"> + <emitter> + <property name="position-x" min="-11" max="13"/> + <property name="position-y" min="-14" max="-22"/> + <property name="horizontal-angle" min="0" max="360"/> + <property name="vertical-angle" min="0" max="90"/> + <property name="power" min="0.1" max="0.3"/> + <property name="gravity" value="-0.03"/> + <animation imageset="graphics/particles/anibubble_8px.png" width="8" height="8"> + <sequence start="0" end="14" delay="1000"/> + </animation> + <property name="lifetime" min="15" max="25"/> + <property name="output" min="0" max="7"/> + <property name="fade-in" value="0"/> + <property name="fade-out" value="5"/> + </emitter> + </particle> +</effect> diff --git a/graphics/sprites/npcs/npc-supply-crate.png b/graphics/sprites/npcs/npc-supply-crate.png Binary files differnew file mode 100644 index 00000000..f9aa2c52 --- /dev/null +++ b/graphics/sprites/npcs/npc-supply-crate.png diff --git a/graphics/sprites/npcs/npc-supply-crate.xml b/graphics/sprites/npcs/npc-supply-crate.xml new file mode 100644 index 00000000..7a3357c9 --- /dev/null +++ b/graphics/sprites/npcs/npc-supply-crate.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/npc-supply-crate.png" width="64" height="32"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/tiles/Woodland_ground.png b/graphics/tiles/Woodland_ground.png Binary files differindex a95b040b..89c550f0 100644 --- a/graphics/tiles/Woodland_ground.png +++ b/graphics/tiles/Woodland_ground.png diff --git a/graphics/tiles/cave2.png b/graphics/tiles/cave2.png Binary files differnew file mode 100644 index 00000000..05a13b23 --- /dev/null +++ b/graphics/tiles/cave2.png diff --git a/graphics/tiles/cave2_bilevel.png b/graphics/tiles/cave2_bilevel.png Binary files differnew file mode 100644 index 00000000..63b6fb46 --- /dev/null +++ b/graphics/tiles/cave2_bilevel.png diff --git a/graphics/tiles/cave2_bilevel_water_lava.png b/graphics/tiles/cave2_bilevel_water_lava.png Binary files differnew file mode 100644 index 00000000..94ff06a0 --- /dev/null +++ b/graphics/tiles/cave2_bilevel_water_lava.png diff --git a/graphics/tiles/cave2_sewer_mine.png b/graphics/tiles/cave2_sewer_mine.png Binary files differnew file mode 100644 index 00000000..05542e47 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine.png diff --git a/graphics/tiles/cave2_sewer_mine_x2.png b/graphics/tiles/cave2_sewer_mine_x2.png Binary files differnew file mode 100644 index 00000000..858e08f0 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x2.png diff --git a/graphics/tiles/cave2_sewer_mine_x3.png b/graphics/tiles/cave2_sewer_mine_x3.png Binary files differnew file mode 100644 index 00000000..cf03b1fb --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x3.png diff --git a/graphics/tiles/cave2_sewer_mine_x4.png b/graphics/tiles/cave2_sewer_mine_x4.png Binary files differnew file mode 100644 index 00000000..00ec4e79 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x4.png diff --git a/graphics/tiles/cave2_sewers.png b/graphics/tiles/cave2_sewers.png Binary files differnew file mode 100644 index 00000000..d677f165 --- /dev/null +++ b/graphics/tiles/cave2_sewers.png diff --git a/graphics/tiles/cave2_transistions.png b/graphics/tiles/cave2_transistions.png Binary files differnew file mode 100644 index 00000000..772d5733 --- /dev/null +++ b/graphics/tiles/cave2_transistions.png diff --git a/graphics/tiles/cave2_x2.png b/graphics/tiles/cave2_x2.png Binary files differnew file mode 100644 index 00000000..6acd5378 --- /dev/null +++ b/graphics/tiles/cave2_x2.png diff --git a/graphics/tiles/desert2.png b/graphics/tiles/desert2.png Binary files differindex 30d5c07f..fef450dc 100644 --- a/graphics/tiles/desert2.png +++ b/graphics/tiles/desert2.png diff --git a/graphics/tiles/snow_docks.png b/graphics/tiles/snow_docks.png Binary files differnew file mode 100644 index 00000000..7526ba32 --- /dev/null +++ b/graphics/tiles/snow_docks.png diff --git a/graphics/tiles/woodland_indoor_x2.png b/graphics/tiles/woodland_indoor_x2.png Binary files differindex 223b2251..3da4d781 100644 --- a/graphics/tiles/woodland_indoor_x2.png +++ b/graphics/tiles/woodland_indoor_x2.png |
