diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-10-16 14:46:13 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-10-16 14:46:13 +0000 |
| commit | ef0b7dda921b8a7137545b483902c51dd4866b84 (patch) | |
| tree | 064bf6843e52c8c14c60b09b8888ecb78da0bfb5 | |
| parent | c63153b8550e640e4b476d452b88fc2dbc3bb5af (diff) | |
| parent | 23b0422bb152c51d504ffa589fa8ad52619b5f47 (diff) | |
| download | evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.gz evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.bz2 evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.xz evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.zip | |
Merge branch 'mickmedia' into 'master'
Mickmedia
See merge request evol/evol-media!6
| -rw-r--r-- | Equipment/hathathat.xcf | bin | 0 -> 381309 bytes | |||
| -rw-r--r-- | Equipment/sprites MASTER.xcf | bin | 0 -> 10151433 bytes | |||
| -rw-r--r-- | Icon/16/potionicons.xcf | bin | 0 -> 29221 bytes | |||
| -rw-r--r-- | LICENSE | 20 | ||||
| -rw-r--r-- | Other/Sprites/firedummy2.xcf | bin | 0 -> 966733 bytes | |||
| -rw-r--r-- | Other/Sprites/growing flowers.xcf | bin | 0 -> 146116 bytes | |||
| -rw-r--r-- | Other/Sprites/rowboat.xcf | bin | 0 -> 3307512 bytes | |||
| -rw-r--r-- | Other/evol_colorschemes.png | bin | 0 -> 26520 bytes | |||
| -rw-r--r-- | Other/evol_colorschemes.xcf | bin | 0 -> 81917 bytes | |||
| -rw-r--r-- | Other/worldmap_mick_0.4.png (renamed from Other/WorldMap.png) | bin | 3744323 -> 3744323 bytes | |||
| -rw-r--r-- | Other/worldmap_mick_3.1.png | bin | 0 -> 2790787 bytes | |||
| -rw-r--r-- | Other/worldmap_mick_3.1.xcf | bin | 0 -> 75002972 bytes | |||
| -rw-r--r-- | Skill/skill icons.xcf | bin | 0 -> 905360 bytes | |||
| -rw-r--r-- | Tileset/LAVA.xcf | bin | 0 -> 1965232 bytes | |||
| -rw-r--r-- | Tileset/NewTrees.xcf | bin | 0 -> 1880922 bytes | |||
| -rw-r--r-- | Tileset/hurns_cave.xcf | bin | 0 -> 1020034 bytes | |||
| -rw-r--r-- | Tileset/water-flow.xcf | bin | 0 -> 1343409 bytes |
17 files changed, 17 insertions, 3 deletions
diff --git a/Equipment/hathathat.xcf b/Equipment/hathathat.xcf Binary files differnew file mode 100644 index 0000000..061a111 --- /dev/null +++ b/Equipment/hathathat.xcf diff --git a/Equipment/sprites MASTER.xcf b/Equipment/sprites MASTER.xcf Binary files differnew file mode 100644 index 0000000..bc5168b --- /dev/null +++ b/Equipment/sprites MASTER.xcf diff --git a/Icon/16/potionicons.xcf b/Icon/16/potionicons.xcf Binary files differnew file mode 100644 index 0000000..0dc8177 --- /dev/null +++ b/Icon/16/potionicons.xcf @@ -20,16 +20,20 @@ https://www.gitorious.org/evol/evol-media/blobs/master/LICENSE path/to/the/licensed/work.something (Authors' Nick) (License) (Contributors' Nick) # Equipment - Equipment/vneckjumper-female.xcf (Reid, Saphy) (CC BY-SA 3.0) (-) - Equipment/vneckjumper-male.xcf (Reid, Saphy) (CC BY-SA 3.0) (-) + Equipment/hathathat.xcf (COLLECTION) (CC BY-SA 3.0 / GPLv2)(-) Equipment/legionarmor-female.xcf (Reid) (CC BY-SA 3.0) (Saphy) Equipment/legionarmor-male.xcf (Reid) (CC BY-SA 3.0) (Saphy) + Equipment/legionarmor-male.xcf (Reid) (CC BY-SA 3.0) (Saphy) + Equipment/sprites MASTER.xcf (COLLECTION) (CC BY-SA 3.0 / GPLv2)(-) + Equipment/vneckjumper-female.xcf (Reid, Saphy) (CC BY-SA 3.0) (-) + Equipment/vneckjumper-male.xcf (Reid, Saphy) (CC BY-SA 3.0) (-) # Icon # 16*16 Icon/16/amulet.png (Reid) (CC BY-SA 3.0) (-) Icon/16/blue-shield-1.png (Reid) (CC BY-SA 3.0) (-) Icon/16/blue-shield-2.png (Reid) (CC BY-SA 3.0) (-) + Icon/16/potionicons.xcf (Micksha) (CC BY-SA 3.0) (-) # NPC NPC/Artis_indoor_door.xcf (Reid) (CC BY-SA 3.0) (IvanMorve) @@ -52,11 +56,17 @@ https://www.gitorious.org/evol/evol-media/blobs/master/LICENSE Other/Overworld.png (WildX) (CC BY-SA 3.0) (Wushin, Micksha) Other/OverworldStylized.xcf (WildX, Micksha) (CC BY-SA 3.0) (-) Other/Ship.gbr (Wushin) (CC BY-SA 3.0) (-) - Other/WorldMap.png (Bagzie, IvanMorve, Len, Reid, Wushin) (CC BY-SA 3.0) (-) + Other/worldmap_mick_0.4.png (Micksha) (CC BY-SA 3.0) (-) + Other/worldmap_mick_3.1.png (Micksha) (CC BY-SA 3.0) (-) + Other/worldmap_mick_3.1.xcf (Micksha) (CC BY-SA 3.0) (-) Other/WorldMap.tmx (Wushin) (CC BY-SA 3.0) (-) + Other/Sprites/firedummy2.xcf (Micksha) (CC BY-SA 3.0) (-) + Other/Sprites/growing flowers.xcf (Micksha) (CC BY-SA 3.0) (-) + Other/Sprites/rowboat.xcf (Micksha) (CC BY-SA 3.0) (-) # Skill Skill/skill.xcf (Reid) (CC BY-SA 3.0) (-) + Skill/skill icons.xcf (Micksha) (CC BY-SA 3.0) (-) # Tiled animation Tiled animation/water.tsx (Reid) (CC BY-SA 3.0) (-) @@ -79,9 +89,13 @@ https://www.gitorious.org/evol/evol-media/blobs/master/LICENSE Tileset/Artis_pavement.xcf (IvanMorve, Reid) (CC BY-SA 3.0) (-) Tileset/Artis_waterblockwall.xcf (Hal9000, Reid) (CC BY-SA 3.0) (-) Tileset/Ground.xcf (FotherJ, IvanMorve, Len, Reid) (CC BY-SA 3.0) (Crush) + Tileset/hurns_cave.xcf (Micksha) (CC BY-SA 3.0) (-) Tileset/Hurns_ground.xcf (FotherJ, IvanMorve, Len, Reid) (CC BY-SA 3.0) (Crush) + Tileset/LAVA.xcf (Micksha) (CC BY-SA 3.0) (-) + Tileset/NewTrees.xcf (Micksha) (CC BY-SA 3.0) (-) Tileset/Ship.xcf (Lunovox) (GPLv2) (Hal9000, Reid, Saci) Tileset/Ship_indoor.xcf (Lunovox) (GPLv2) (Reid, Saci) Tileset/Ship_mast.xcf (Lunovox) (GPLv2) (Alige, Hal9000, Reid, Saci) + Tileset/water-flow.xcf (Micksha) (CC BY-SA 3.0) (-) (-): No other contributor. diff --git a/Other/Sprites/firedummy2.xcf b/Other/Sprites/firedummy2.xcf Binary files differnew file mode 100644 index 0000000..0476c23 --- /dev/null +++ b/Other/Sprites/firedummy2.xcf diff --git a/Other/Sprites/growing flowers.xcf b/Other/Sprites/growing flowers.xcf Binary files differnew file mode 100644 index 0000000..b6f1728 --- /dev/null +++ b/Other/Sprites/growing flowers.xcf diff --git a/Other/Sprites/rowboat.xcf b/Other/Sprites/rowboat.xcf Binary files differnew file mode 100644 index 0000000..8902646 --- /dev/null +++ b/Other/Sprites/rowboat.xcf diff --git a/Other/evol_colorschemes.png b/Other/evol_colorschemes.png Binary files differnew file mode 100644 index 0000000..82809fa --- /dev/null +++ b/Other/evol_colorschemes.png diff --git a/Other/evol_colorschemes.xcf b/Other/evol_colorschemes.xcf Binary files differnew file mode 100644 index 0000000..78ad78f --- /dev/null +++ b/Other/evol_colorschemes.xcf diff --git a/Other/WorldMap.png b/Other/worldmap_mick_0.4.png Binary files differindex dc11f06..dc11f06 100644 --- a/Other/WorldMap.png +++ b/Other/worldmap_mick_0.4.png diff --git a/Other/worldmap_mick_3.1.png b/Other/worldmap_mick_3.1.png Binary files differnew file mode 100644 index 0000000..7c8cc39 --- /dev/null +++ b/Other/worldmap_mick_3.1.png diff --git a/Other/worldmap_mick_3.1.xcf b/Other/worldmap_mick_3.1.xcf Binary files differnew file mode 100644 index 0000000..ba99979 --- /dev/null +++ b/Other/worldmap_mick_3.1.xcf diff --git a/Skill/skill icons.xcf b/Skill/skill icons.xcf Binary files differnew file mode 100644 index 0000000..f3d4b25 --- /dev/null +++ b/Skill/skill icons.xcf diff --git a/Tileset/LAVA.xcf b/Tileset/LAVA.xcf Binary files differnew file mode 100644 index 0000000..bffa26f --- /dev/null +++ b/Tileset/LAVA.xcf diff --git a/Tileset/NewTrees.xcf b/Tileset/NewTrees.xcf Binary files differnew file mode 100644 index 0000000..7e14966 --- /dev/null +++ b/Tileset/NewTrees.xcf diff --git a/Tileset/hurns_cave.xcf b/Tileset/hurns_cave.xcf Binary files differnew file mode 100644 index 0000000..7fb80c4 --- /dev/null +++ b/Tileset/hurns_cave.xcf diff --git a/Tileset/water-flow.xcf b/Tileset/water-flow.xcf Binary files differnew file mode 100644 index 0000000..6891849 --- /dev/null +++ b/Tileset/water-flow.xcf |
