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 /LICENSE | |
| 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
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -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. |