From 71be91b5c03b09139465723ffb56ed8fd6d5a0fe Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 24 Oct 2020 12:35:47 +0000 Subject: CONTENT III - Super Merge Request Part 1/2 on content for Novemember 11th deadline --- LICENSE | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 7b369520..0a1d4248 100644 --- a/LICENSE +++ b/LICENSE @@ -333,6 +333,7 @@ legal@themanaworld.org graphics/items/generic/trout.png (Reid) (CC BY-SA 4.0, GPLv3) (Micksha) graphics/items/generic/codfish.png (Reid) (CC BY-SA 4.0, GPLv3) (Micksha) graphics/items/generic/squirrelpelt.png (Wombat, Enchilado) (CC BY-SA 3.0, GPLv2) (-) + graphics/items/generic/suitcase.png (Nami) (CC BY-SA 3.0, GPLv3) (Enchilado, Jesusalva) graphics/items/generic/salmon.png (Reid) (CC BY-SA 4.0, GPLv3) (Micksha) graphics/items/generic/cottoncloth.png (LEGACY, wushin) (CC BY-SA 3.0) (-) @@ -556,6 +557,25 @@ legal@themanaworld.org graphics/minimaps/008-3-5.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/008-3-6.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/009-1.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-0.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-1.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-2.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-3.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-4.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-5.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-6.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-7.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-8.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-9.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-10.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-11.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-12.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-13.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-14.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-15.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-16.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-17.png (Micksha) (CC BY-SA 3.0) (-) + graphics/minimaps/009-2-18.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/012-1.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/012-2-1.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/012-2-2.png (Micksha) (CC BY-SA 3.0) (-) @@ -568,6 +588,45 @@ legal@themanaworld.org graphics/minimaps/012-3-2.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/012-3-3.png (Micksha) (CC BY-SA 3.0) (-) graphics/minimaps/020-1.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-0.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-1.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-2.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-3.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-4.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-5.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-6.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-7.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-8.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-9.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-10.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-11.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-12.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-13.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-14.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-15.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-16.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-17.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-18.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-19.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-20.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-21.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-22.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-23.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-24.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-25.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-26.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-27.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-28.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-29.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-30.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-31.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-32.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-33.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/020-2-34.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/fermi.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/botcheck.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/marine.png (Jesusalva) (CC BY-SA 3.0) (-) + graphics/minimaps/marine-2.png (Jesusalva) (CC BY-SA 3.0) (-) graphics/minimaps/sec_pri.png (Jesusalva) (CC BY-SA 3.0) (-) graphics/minimaps/testbg.png (Jesusalva) (CC BY-SA 3.0) (-) graphics/minimaps/test.png (Jesusalva) (CC BY-SA 3.0) (-) @@ -581,6 +640,8 @@ legal@themanaworld.org graphics/particles/arrowh.png (LEGACY) (GPLv2) (-) graphics/particles/blaze.png (Crush) (GPLv2, CC BY-SA 3.0) (Mickhsa) graphics/particles/bubble.png (Crush) (CC BY-SA 3.0) (-) + graphics/particles/circle-magic-trail.png (?) (GPLv3) (TMW-BR) + graphics/particles/circle-magic.png (Lunovox) (GPLv3) (TMW-BR) graphics/particles/electricity.particle.png (LEGACY) (GPLv2) (-) graphics/particles/fireball.png (LEGACY) (GPLv2) (-) graphics/particles/fog-medium.png (Crush) (CC BY-SA 3.0) (Reid) @@ -709,6 +770,9 @@ legal@themanaworld.org graphics/sprites/accessories/tipiou-hat.png (Bagzie) (CC BY-SA 3.0) (Reid) graphics/sprites/accessories/water-fish.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/accessories/water-splash.png (Reid) (CC BY-SA 3.0) (-) +## Avatars + graphics/sprites/avatars/aisleriot_ornamental.png (Callum McKenzie) (GPL v3) (Christian Persch, Jesusalva) + * https://gitlab.gnome.org/GNOME/aisleriot/blob/master/COPYING.README ## Effects graphics/sprites/effects/queststatus.png (Reid) (CC BY-SA 3.0) (-) ## Equipments @@ -1072,6 +1136,7 @@ legal@themanaworld.org graphics/sprites/npcs/sprite/lydon.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/magicarpan.png (Reid) (CC BY-SA 3.0) (Len, Modanung) graphics/sprites/npcs/sprite/manatree.png (Nami) (CC BY-SA 3.0) (-) + graphics/sprites/npcs/sprite/marine.png (Saulc) (CC BY-SA 4.0) (-) graphics/sprites/npcs/sprite/mona.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/nard.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/npcs/sprite/piourocket.png (Reid) (CC BY-SA 3.0) (Fother_J) @@ -1087,6 +1152,7 @@ legal@themanaworld.org graphics/sprites/npcs/sprite/sophialla.png (Micksha) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/tarlan.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/terry.png (Reid) (CC BY-SA 3.0) (Salva) + graphics/sprites/npcs/sprite/tiki.png (LEGACY, TMW-Br DEV Team) (GPLv2) (Jesusalva) graphics/sprites/npcs/sprite/toichi.png (ChefChelios) (CC BY-SA 3.0) (Micksha, Reid) graphics/sprites/npcs/sprite/treeleaf.png (Sogomn) (CC BY-SA 3.0) (Reid) graphics/sprites/npcs/sprite/unanimated.png (Lien, Modanung, Reid) (CC BY-SA 3.0) (Crush, Fother, Nami, Talaroc) @@ -1232,6 +1298,7 @@ legal@themanaworld.org graphics/tilesets/level-number.png (Reid) (CC BY-SA 3.0) (-) graphics/tilesets/light-flickering-x1x4.png (Micksha) (CC BY-SA 3.0) (-) graphics/tilesets/mana-liane-x1x3.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/sail.png (Saulc) (CC BY-SA 4.0) (-) graphics/tilesets/shadow.png (Reid) (CC BY-SA 3.0) (Hal9000) graphics/tilesets/ship-base.png (Lunovox) (GPLv2) (Hal9000, Reid, Saci) graphics/tilesets/ship-indoor.png (Lunovox) (GPLv2) (Reid, Saci) @@ -1286,7 +1353,7 @@ legal@themanaworld.org maps/000-2-2.tmx (Reid) (CC BY-SA 3.0) (-) maps/000-2-3.tmx (Reid) (CC BY-SA 3.0) (-) maps/000-2-4.tmx (Reid) (CC BY-SA 3.0) (-) - maps/001-1.tmx (Reid) (CC BY-SA 3.0) (Alige, wushin) + maps/001-1.tmx (Reid) (CC BY-SA 3.0) (Alige, wushin, Saulc) maps/001-2-0.tmx (Reid) (CC BY-SA 3.0) (-) maps/001-2-1.tmx (Reid) (CC BY-SA 3.0) (-) maps/001-2-2.tmx (Reid) (CC BY-SA 3.0) (-) -- cgit v1.2.3-60-g2f50