From 3061d90f72f8e374e457eec9c2b1a32b94b80e0b Mon Sep 17 00:00:00 2001 From: tux9th Date: Mon, 17 Jun 2013 17:47:08 +0200 Subject: Updating license.txt. --- license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'license.txt') diff --git a/license.txt b/license.txt index aabf40ac..062183cc 100644 --- a/license.txt +++ b/license.txt @@ -923,7 +923,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/Woodland_graveyard_ground.png (????, Crush) (GPLv2) graphics/tiles/Woodland_graveyard_x3.png (????, Black Don, Crush) (GPLv2) graphics/tiles/Woodland_graveyard_x4.png (????, Crush, Spit23) (GPLv2) - graphics/tiles/Woodland_ground.png (????, Crush) (GPLv2) + graphics/tiles/Woodland_ground.png (????, Crush, Wombat) (GPLv2) graphics/tiles/woodland_indoor_x2.png (????, Crush) (GPLv2) graphics/tiles/woodland_indoor_x3.png (????, Crush) (GPLv2) graphics/tiles/woodland_indoor.png (????, Crush, Yosuhara) (GPLv2) -- cgit v1.2.3-70-g09d2 From fa86b982fd820a4cf7112719bd721db0dc811b28 Mon Sep 17 00:00:00 2001 From: wushin Date: Fri, 21 Jun 2013 12:21:09 -0500 Subject: and all the liscene file changes for all the art in previous commits --- license.txt | 159 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 86 insertions(+), 73 deletions(-) (limited to 'license.txt') diff --git a/license.txt b/license.txt index aabf40ac..4dfb22be 100644 --- a/license.txt +++ b/license.txt @@ -483,6 +483,8 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/particles/bat-shadow.png (????) (GPLv2) graphics/particles/blaze.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/particles/bubble_8px.png (Crush) (GPLv2), (CC BY-SA 3.0) + graphics/particles/anibubble_8px.png (Crush,wushin) (GPLv2), (CC BY-SA 3.0) + graphics/particles/anibubble_8px_green.png (Crush,wushin) (GPLv2), (CC BY-SA 3.0) graphics/particles/bubble_12px.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/particles/bubble_32px.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/particles/casket-trap_96x96.png (Skipy) (GPLv2) @@ -847,6 +849,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/npc-savannahman.png (Modanung) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-test.png (Modanung) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-treasurebox.png (????) (GPLv2) + graphics/sprites/npcs/npc-supply-crate.png (????,wushin) (GPLv2) graphics/sprites/npcs/npc-undeadbanker.png (Reid) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-weaver.png (ChefChelios) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-woodenpump.png (Varuna) (GPLv2), (CC BY-SA 3.0) @@ -862,77 +865,87 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/thermin_npcs.png (Lien, Nami, Salmondine, Varuna) (GPLv2) # Tilesets - graphics/tiles/arena.png (????) (GPLv2) - graphics/tiles/barbarians-outdoor.png (Salmondine) (GPLv2) - graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2) - graphics/tiles/castle-1.png (Alige, EJlol, Irukard, Len, MerlinX420) (GPLv2) - graphics/tiles/castle-2.png (Alige, EJlol, Irukard, IvanMorve Len, MerlinX420) (GPLv2) - graphics/tiles/cave_ani_wetwall.png (Octalot) (GPLv2) - graphics/tiles/cave_bilevel.png (Bjorn, Octalot) (GPLv2) - graphics/tiles/cave_x2.png (Bjorn, Octalot) (GPLv2) - graphics/tiles/cave.png (Bjorn, Modanung, Georg, Octalot) (GPLv2) - graphics/tiles/christmastree.png (????) (GPLv2) - graphics/tiles/clock.png (Salmondine) (GPLv2) - graphics/tiles/collision.png (Bjorn) (GPLv2) - graphics/tiles/Crypt-Archways.png (Irukard, MerlinX420) (GPLv2) - graphics/tiles/Crypt-Blockwall.png (Irukard) (GPLv2) - graphics/tiles/Crypt-Fringe_x3.png (Crush, Irukard, Nmaligec, Salmondine) (GPLv2) - graphics/tiles/Crypt-Fringe.png (Black Don, Crush, Irukard, Skipy, Spit23) (GPLv2) - graphics/tiles/desert_x2_old.png (????) (GPLv2) - graphics/tiles/desert_x2.png (????, wushin) (GPLv2) - graphics/tiles/desert_x3.png (????) (GPLv2) - graphics/tiles/desert_x5.png (????) (GPLv2) - graphics/tiles/desert1.png (????) (GPLv2) - graphics/tiles/desert2.png (????) (GPLv2) + graphics/tiles/arena.png (????) (GPLv2) + graphics/tiles/barbarians-outdoor.png (Salmondine) (GPLv2) + graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2) + graphics/tiles/castle-1.png (Alige, EJlol, Irukard, Len, MerlinX420) (GPLv2) + graphics/tiles/castle-2.png (Alige, EJlol, Irukard, IvanMorve Len, MerlinX420) (GPLv2) + graphics/tiles/cave_ani_wetwall.png (Octalot) (GPLv2) + graphics/tiles/cave_bilevel.png (Bjorn, Octalot) (GPLv2) + graphics/tiles/cave_x2.png (Bjorn, Octalot) (GPLv2) + graphics/tiles/cave.png (Bjorn, Modanung, Georg, Octalot) (GPLv2) + graphics/tiles/cave2_bilevel.png (Bjorn, Octalot, Len, wushin) (GPLv2) + graphics/tiles/cave2_bilevel_water_lava.png (Bjorn, Octalot, Len, Fother, wushin) (GPLv2) + graphics/tiles/cave2.png (Bjorn, Modanung, Georg, Octalot, Len, Enchilado, Fother, wushin) (GPLv2) + graphics/tiles/cave2_sewers.png (????, Len, wushin) (GPLv2) + graphics/tiles/cave2_sewer_mine.png (Fother, wushin) (GPLv2) + graphics/tiles/cave2_sewer_mine_x2.png (Fother, wushin) (GPLv2) + graphics/tiles/cave2_sewer_mine_x3.png (Fother, wushin) (GPLv2) + graphics/tiles/cave2_sewer_mine_x4.png (Fother, wushin) (GPLv2) + graphics/tiles/cave2_transistions.png (????, Bjorn, Modanung, Georg, Octalot, Len, Enchilado, Fother, wushin) (GPLv2) + graphics/tiles/cave2_x2.png (????, Bjorn, Octalot, Len, wushin) (GPLv2) + graphics/tiles/christmastree.png (????) (GPLv2) + graphics/tiles/clock.png (Salmondine) (GPLv2) + graphics/tiles/collision.png (Bjorn) (GPLv2) + graphics/tiles/Crypt-Archways.png (Irukard, MerlinX420) (GPLv2) + graphics/tiles/Crypt-Blockwall.png (Irukard) (GPLv2) + graphics/tiles/Crypt-Fringe_x3.png (Crush, Irukard, Nmaligec, Salmondine) (GPLv2) + graphics/tiles/Crypt-Fringe.png (Black Don, Crush, Irukard, Skipy, Spit23) (GPLv2) + graphics/tiles/desert_x2_old.png (????) (GPLv2) + graphics/tiles/desert_x2.png (????, wushin) (GPLv2) + graphics/tiles/desert_x3.png (????) (GPLv2) + graphics/tiles/desert_x5.png (????) (GPLv2) + graphics/tiles/desert1.png (????) (GPLv2) + graphics/tiles/desert2.png (????) (GPLv2) graphics/tiles/desert3.png (????,wushin) (GPLv2) - graphics/tiles/Forest_cover.png (Len) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/icecave.png (????, Crush, Octalot) (GPLv2) - graphics/tiles/inn_x2.png (Irukard) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/inn_x3.png (Irukard, Salmondine) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/inn_x4.png (Salmondine) (GPLv2) - graphics/tiles/inn.png (Irukard) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/inn2.png (Alige, Irukard, Salmondine) (GPLv2) - graphics/tiles/mountain.png (????) (GPLv2) - graphics/tiles/mushrooms.png (Dave, Len) (GPLv2) - graphics/tiles/Pots_x2.png (????) (GPLv2) - graphics/tiles/power_circle_x2.png (????) (GPLv2) - graphics/tiles/set_cave.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_desert.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_icecave.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_cave.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_rules.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_thermin_cave.png (????, PjotrOrial) (GPLv2) - graphics/tiles/set_woodland.png (????, PjotrOrial) (GPLv2) - graphics/tiles/Snow_ground_x2.png (????) (GPLv2) - graphics/tiles/Snow_ground.png (????) (GPLv2) - graphics/tiles/Snow_tree_x3.png (????, Alige, Hal9000) (GPLv2) - graphics/tiles/Snow_village.png (????) (GPLv2) - graphics/tiles/Snow_village2.png (????) (GPLv2) - graphics/tiles/Snow_x2.png (????, Nami, Salmondine) (GPLv2) - graphics/tiles/Snow_x3.png (????) (GPLv2) - graphics/tiles/Snow.png (????) (GPLv2) - graphics/tiles/soulmenhirs_x2.png (Alige, Lien) (GPLv2) - graphics/tiles/thermin-cave.png (Lien) (GPLv2) - graphics/tiles/thermin-outdoor.png (????, Lien) (GPLv2) - graphics/tiles/tictactoe.png (????) (GPLv2) - graphics/tiles/trans_woodland-desert.png (????) (GPLv2) - graphics/tiles/Tulimshar_Docks.png (????) (GPLv2) - graphics/tiles/tulimshar1.png (Modanung) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/Witch_sisters_picture_x3.png (????) (GPLv2) - graphics/tiles/Woodland_graveyard_crypt.png (????, Spit23) (GPLv2) - graphics/tiles/Woodland_graveyard_ground.png (????, Crush) (GPLv2) - graphics/tiles/Woodland_graveyard_x3.png (????, Black Don, Crush) (GPLv2) - graphics/tiles/Woodland_graveyard_x4.png (????, Crush, Spit23) (GPLv2) - graphics/tiles/Woodland_ground.png (????, Crush) (GPLv2) - graphics/tiles/woodland_indoor_x2.png (????, Crush) (GPLv2) - graphics/tiles/woodland_indoor_x3.png (????, Crush) (GPLv2) - graphics/tiles/woodland_indoor.png (????, Crush, Yosuhara) (GPLv2) - graphics/tiles/Woodland_swamp.png (Len) (GPLv2), (CC BY-SA 3.0) - graphics/tiles/Woodland_village_x2.png (????, Crush) (GPLv2) - graphics/tiles/Woodland_village.png (????, Crush) (GPLv2) - graphics/tiles/Woodland_water.png (????) (GPLv2) - graphics/tiles/Woodland_x2.png (????, Crush, Len, Saphy) (GPLv2) - graphics/tiles/Woodland_x3.png (????, Crush, Len, Saphy) (GPLv2) - graphics/tiles/Woodland_x4.png (????, Len, Saphy) (GPLv2) - graphics/tiles/Woodland_x5.png (Saphy, ????) (GPLv2) - graphics/tiles/Woodland_x8.png (Len) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/Forest_cover.png (Len) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/icecave.png (????, Crush, Octalot) (GPLv2) + graphics/tiles/inn_x2.png (Irukard) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/inn_x3.png (Irukard, Salmondine) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/inn_x4.png (Salmondine) (GPLv2) + graphics/tiles/inn.png (Irukard) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/inn2.png (Alige, Irukard, Salmondine) (GPLv2) + graphics/tiles/mountain.png (????) (GPLv2) + graphics/tiles/mushrooms.png (Dave, Len) (GPLv2) + graphics/tiles/Pots_x2.png (????) (GPLv2) + graphics/tiles/power_circle_x2.png (????) (GPLv2) + graphics/tiles/set_cave.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_desert.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_icecave.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_cave.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_rules.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_thermin_cave.png (????, PjotrOrial) (GPLv2) + graphics/tiles/set_woodland.png (????, PjotrOrial) (GPLv2) + graphics/tiles/Snow_ground_x2.png (????) (GPLv2) + graphics/tiles/Snow_ground.png (????) (GPLv2) + graphics/tiles/Snow_tree_x3.png (????, Alige, Hal9000) (GPLv2) + graphics/tiles/Snow_village.png (????) (GPLv2) + graphics/tiles/Snow_village2.png (????) (GPLv2) + graphics/tiles/Snow_x2.png (????, Nami, Salmondine) (GPLv2) + graphics/tiles/Snow_x3.png (????) (GPLv2) + graphics/tiles/Snow.png (????) (GPLv2) + graphics/tiles/soulmenhirs_x2.png (Alige, Lien) (GPLv2) + graphics/tiles/thermin-cave.png (Lien) (GPLv2) + graphics/tiles/thermin-outdoor.png (????, Lien) (GPLv2) + graphics/tiles/tictactoe.png (????) (GPLv2) + graphics/tiles/trans_woodland-desert.png (????) (GPLv2) + graphics/tiles/Tulimshar_Docks.png (????) (GPLv2) + graphics/tiles/tulimshar1.png (Modanung) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/Witch_sisters_picture_x3.png (????) (GPLv2) + graphics/tiles/Woodland_graveyard_crypt.png (????, Spit23) (GPLv2) + graphics/tiles/Woodland_graveyard_ground.png (????, Crush) (GPLv2) + graphics/tiles/Woodland_graveyard_x3.png (????, Black Don, Crush) (GPLv2) + graphics/tiles/Woodland_graveyard_x4.png (????, Crush, Spit23) (GPLv2) + graphics/tiles/Woodland_ground.png (????, Crush) (GPLv2) + graphics/tiles/woodland_indoor_x2.png (????, Crush) (GPLv2) + graphics/tiles/woodland_indoor_x3.png (????, Crush) (GPLv2) + graphics/tiles/woodland_indoor.png (????, Crush, Yosuhara) (GPLv2) + graphics/tiles/Woodland_swamp.png (Len) (GPLv2), (CC BY-SA 3.0) + graphics/tiles/Woodland_village_x2.png (????, Crush) (GPLv2) + graphics/tiles/Woodland_village.png (????, Crush) (GPLv2) + graphics/tiles/Woodland_water.png (????) (GPLv2) + graphics/tiles/Woodland_x2.png (????, Crush, Len, Saphy) (GPLv2) + graphics/tiles/Woodland_x3.png (????, Crush, Len, Saphy) (GPLv2) + graphics/tiles/Woodland_x4.png (????, Len, Saphy) (GPLv2) + graphics/tiles/Woodland_x5.png (Saphy, ????) (GPLv2) + graphics/tiles/Woodland_x8.png (Len) (GPLv2), (CC BY-SA 3.0) -- cgit v1.2.3-70-g09d2 From 113ae7a2bd3f2751c1c60322a8b3a02461fec174 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 30 Jun 2013 23:43:01 +0200 Subject: Update license file for Nami's graphics, since he agreed to dual licensing. --- license.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'license.txt') diff --git a/license.txt b/license.txt index 6d350f88..493b141f 100644 --- a/license.txt +++ b/license.txt @@ -139,7 +139,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/equipment/head/cap.png (Black Don) (GPLv2) graphics/items/equipment/head/captain_hat.png (Black Don) (GPLv2) graphics/items/equipment/head/catears.png (Angeliex) (GPLv2) - graphics/items/equipment/head/chefhat.png (Nami) (GPLv2) + graphics/items/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/equipment/head/christmastree.png (????) (GPLv2) graphics/items/equipment/head/circlet.png (VictorSan) (GPLv2) graphics/items/equipment/head/cowboyblack.png (Black Don) (GPLv2) @@ -285,17 +285,17 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/equipment/weapon/sword-sword.png (Irukard) (GPLv2), (CC BY-SA 3.0) ## Generic graphics/items/generic/animal-bones.png (Leela) (GPLv2) - graphics/items/generic/antlers.png (Nami) (GPLv2) + graphics/items/generic/antlers.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bandit-hood.png (????) (GPLv2) graphics/items/generic/batteeth.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/batwing.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bent-needle.png (????) (GPLv2) graphics/items/generic/blackpearl.png (????, Fate) (GPLv2) - graphics/items/generic/blanket.png (Nami) (GPLv2) + graphics/items/generic/blanket.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bluepresentbox.png (????) (GPLv2) graphics/items/generic/bone.png (Yosuhara) (GPLv2) graphics/items/generic/bottle-empty.png (FotherJ) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/bottle-ice.png (FotherJ, Nami) (GPLv2) + graphics/items/generic/bottle-ice.png (FotherJ, Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bottle-sand.png (FotherJ) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/broken-fourleaf-amulet.png (Alige, Fate) (GPLv2) graphics/items/generic/brokendoll.png (Enchilado) (GPLv2), (CC BY-SA 3.0) @@ -327,7 +327,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/fabric.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/fakefangs.png (????) (GPLv2) graphics/items/generic/flawed-lens.png (Skipy) (GPLv2) - graphics/items/generic/flighttalisman.png (Nami) (GPLv2) + graphics/items/generic/flighttalisman.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/frozen-yeti-tear.png (ChefChelios) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/gempowder.png (Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/gemstone-a.png (Crush) (GPLv2), (CC BY-SA 3.0) @@ -351,7 +351,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/lazurite-heart.png (V0id) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/lazurite-shard.png (V0id) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/leatherball.png (Lizandra, Salmondine) (GPLv2) - graphics/items/generic/leathersuitcase.png (Nami) (GPLv2) + graphics/items/generic/leathersuitcase.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/lockpicks.png (????) (GPLv2) graphics/items/generic/maggotslime.png (????) (GPLv2) graphics/items/generic/mylarin-dust.png (????, FotherJ, Salmondine) (GPLv2) @@ -365,7 +365,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/purplepresentbox.png (????) (GPLv2) graphics/items/generic/rags-rotten.png (FotherJ) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/rawlog.png (????) (GPLv2) - graphics/items/generic/rawtalisman.png (Nami) (GPLv2) + graphics/items/generic/rawtalisman.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/realisticbrain.png (Skipy) (GPLv2) graphics/items/generic/redstocking.png (????) (GPLv2) graphics/items/generic/reedbundle.png (Salmondine) (GPLv2) @@ -405,16 +405,16 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/whitefur.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/whitepresentbox.png (????) (GPLv2) graphics/items/generic/wolvern-pelt.png (Len) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/wolvern-tooth.png (Alige, Nami) (GPLv2) + graphics/items/generic/wolvern-tooth.png (Alige, Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/wooden-mouboo.png (????) (GPLv2) graphics/items/generic/wrapping-paper-dotted.png (Lizandra) (GPLv2) graphics/items/generic/wrapping-paper-striped.png (Lizandra) (GPLv2) graphics/items/generic/yellowpresentbox.png (????) (GPLv2) - graphics/items/generic/yeti-claw.png (Nami) (GPLv2) + graphics/items/generic/yeti-claw.png (Nami) (GPLv2), (CC BY-SA 3.0) ## Use ### Food graphics/items/use/food/acorn.png (Meway) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/acornroasted.png (Nami, V0id) (GPLv2) + graphics/items/use/food/acornroasted.png (Nami, V0id) (GPLv2), (CC BY-SA 3.0) graphics/items/use/food/apple.png (????) (GPLv2) graphics/items/use/food/beer.png (????) (GPLv2) graphics/items/use/food/bigcake.png (Freeyorp101, Kr0n05931) (GPLv2) @@ -444,7 +444,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/use/food/orange.png (EJlol) (GPLv2), (CC BY-SA 3.0) graphics/items/use/food/orangecupcake.png (????) (GPLv2) graphics/items/use/food/pear.png (????) (GPLv2) - graphics/items/use/food/pickled_beets.png (Nami) (GPLv2) + graphics/items/use/food/pickled_beets.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/use/food/plum.png (Alige, Meway) (GPLv2), (CC BY-SA 3.0) graphics/items/use/food/roastedmaggot.png (????) (GPLv2) graphics/items/use/food/shock-candy.png (Kekskiller) (GPLv2) @@ -646,7 +646,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/equipment/head/cap.png (Black Don) (GPLv2) graphics/sprites/equipment/head/captain-hat.png (Black Don) (GPLv2) graphics/sprites/equipment/head/catears.png (Angeliex, Octalot) (GPLv2) - graphics/sprites/equipment/head/chefhat.png (Nami) (GPLv2) + graphics/sprites/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/sprites/equipment/head/christmastree.png (????) (GPLv2) graphics/sprites/equipment/head/circlet.png (VictorSan) (GPLv2) graphics/sprites/equipment/head/cowboyblack.png (Black Don) (GPLv2) @@ -828,7 +828,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/christmas_npcs.png (????, Alige, Lizandra, Salmondine) (GPLv2) graphics/sprites/npcs/evil-obelisk.png (Alige, ChefChelios, Leela) (GPLv2) graphics/sprites/npcs/furnace.png (Salmondine) (GPLv2) - graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami) (GPLv2) + graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-annualeaster.png (????) (GPLv2) graphics/sprites/npcs/npc-beerguyghost.png (Reid, Skipy) (GPLv2) graphics/sprites/npcs/npc-chronos.png (Lien) (GPLv2) @@ -860,14 +860,14 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/saboteur.png (Wombat) (GPLv2) graphics/sprites/npcs/sages.png (Alige, Nami, Salmondine) (GPLv2) graphics/sprites/npcs/shapeshifter.png (Alige, Modanung) (GPLv2), (CC BY-SA 3.0) - graphics/sprites/npcs/sittingsage.png (Alige, Nami) (GPLv2) + graphics/sprites/npcs/sittingsage.png (Alige, Nami) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/soulmenhirs.png (Alige, Lien) (GPLv2) graphics/sprites/npcs/thermin_npcs.png (Lien, Nami, Salmondine, Varuna) (GPLv2) # Tilesets graphics/tiles/arena.png (????) (GPLv2) graphics/tiles/barbarians-outdoor.png (Salmondine) (GPLv2) - graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2) + graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2), (CC BY-SA 3.0) graphics/tiles/castle-1.png (Alige, EJlol, Irukard, Len, MerlinX420) (GPLv2) graphics/tiles/castle-2.png (Alige, EJlol, Irukard, IvanMorve Len, MerlinX420) (GPLv2) graphics/tiles/cave_ani_wetwall.png (Octalot) (GPLv2) -- cgit v1.2.3-70-g09d2 From 43a82883f71f29a3bc8f9d7c24e490c5ab7cf73e Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 8 Jul 2013 20:07:01 +0200 Subject: Add snow docks graphic to license file. --- license.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'license.txt') diff --git a/license.txt b/license.txt index 493b141f..09aeb91e 100644 --- a/license.txt +++ b/license.txt @@ -917,6 +917,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/set_thermin_cave.png (????, PjotrOrial) (GPLv2) graphics/tiles/set_woodland.png (????, PjotrOrial) (GPLv2) graphics/tiles/Snow_ground_x2.png (????) (GPLv2) + graphics/tiles/snow_docks.png (Irukard, Arikel, Meway, Wombat) (GPLv2) graphics/tiles/Snow_ground.png (????) (GPLv2) graphics/tiles/Snow_tree_x3.png (????, Alige, Hal9000) (GPLv2) graphics/tiles/Snow_village.png (????) (GPLv2) -- cgit v1.2.3-70-g09d2 From 6c2c2d458c49bc3a225aa3c7d8ba018b59fa99f4 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 8 Jul 2013 20:11:26 +0200 Subject: Update license file: - add Wombat, Lien and FotherJ as author to some graphics - put CC BY-SA 3.0 to graphics done by Wombat --- license.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'license.txt') diff --git a/license.txt b/license.txt index 09aeb91e..b7c86b6f 100644 --- a/license.txt +++ b/license.txt @@ -79,7 +79,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/images/ambient/snow.png (Dark_Mage) (GPLv2) graphics/images/ambient/spotlight.png (????) (GPLv2) ## Help - graphics/images/help/tmwdyepallet.png (Wombat) (GPLv2) + graphics/images/help/tmwdyepallet.png (Wombat) (GPLv2), (CC BY-SA 3.0) # Item Icons ## Equipment @@ -286,7 +286,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ ## Generic graphics/items/generic/animal-bones.png (Leela) (GPLv2) graphics/items/generic/antlers.png (Nami) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/bandit-hood.png (????) (GPLv2) + graphics/items/generic/bandit-hood.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/batteeth.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/batwing.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bent-needle.png (????) (GPLv2) @@ -341,7 +341,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/herb.png (Irukard) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/hint.png (Modanung) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/ice-cube.png (Alige, Arikel) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/ingot.png (????) (GPLv2) + graphics/items/generic/ingot.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/ironore.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/iten.png (????) (GPLv2) graphics/items/generic/jackolantern.png (????) (GPLv2) @@ -364,7 +364,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/pumpkinseed.png (Enchilado) (GPLv2) graphics/items/generic/purplepresentbox.png (????) (GPLv2) graphics/items/generic/rags-rotten.png (FotherJ) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/rawlog.png (????) (GPLv2) + graphics/items/generic/rawlog.png (Lien) (GPLv2) graphics/items/generic/rawtalisman.png (Nami) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/realisticbrain.png (Skipy) (GPLv2) graphics/items/generic/redstocking.png (????) (GPLv2) @@ -383,7 +383,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/silkcocoon.png (Fate) (GPLv2) graphics/items/generic/silk-sheet.png (bh28, Bjorn) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/silverbell.png (FotherJ) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/silvermirror.png (Wombat) (GPLv2) + graphics/items/generic/silvermirror.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/skull.png (FotherJ) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/smallmushroom.png (????) (GPLv2) graphics/items/generic/snake-tongue.png (Fate) (GPLv2) @@ -393,8 +393,8 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/spell-book-page.png (Salmondine) (GPLv2) graphics/items/generic/spell-book.png (Salmondine) (GPLv2) graphics/items/generic/spice.png (FotherJ) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/squirrel-pelt.png (Wombat) (GPLv2) - graphics/items/generic/stinger-new.png (Wombat) (GPLv2) + graphics/items/generic/squirrel-pelt.png (Wombat) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/stinger-new.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/strange-coin.png (????) (GPLv2) graphics/items/generic/terraniteore.png (Kr0n05931) (GPLv2) graphics/items/generic/tongue.png (Enchilado) (GPLv2), (CC BY-SA 3.0) @@ -437,7 +437,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/use/food/jellyskull.png (????) (GPLv2) graphics/items/use/food/juice.png (Nmaligec, Skipy) (GPLv2) graphics/items/use/food/lady-fingers.png (ChefChelios) (GPLv2), (CC BY-SA 3.0) - graphics/items/use/food/lollipop.png (????) (GPLv2) + graphics/items/use/food/lollipop.png (????, Wombat) (GPLv2) graphics/items/use/food/lollipop2.png (Lizandra) (GPLv2) graphics/items/use/food/marshmallow.png (????) (GPLv2) graphics/items/use/food/milk.png (????) (GPLv2) @@ -755,7 +755,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/hairstyles/hairstyle18.png (LokiF) (GPLv2) graphics/sprites/hairstyles/hairstyle19.png (????) (GPLv2) ## Monsters - graphics/sprites/monsters/archant.png (????) (GPLv2) + graphics/sprites/monsters/archant.png (????, Wombat) (GPLv2) graphics/sprites/monsters/ball-lightning.png (Skipy) (GPLv2) graphics/sprites/monsters/bandit-lord.png (Alige, Skipy, Wombat) (GPLv2) graphics/sprites/monsters/bandit.png (Alige, Skipy, Wombat) (GPLv2) @@ -815,12 +815,12 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/monsters/accessories/empty-frame.png (????) (GPLv2) graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png (????) (GPLv2) graphics/sprites/monsters/accessories/generic-shadow-small-circle.png (????) (GPLv2) - graphics/sprites/monsters/accessories/mouboo-antlers.png (Alige, Wombat) (GPLv2) + graphics/sprites/monsters/accessories/mouboo-antlers.png (Alige, Wombat) (GPLv2), (CC BY-SA 3.0) graphics/sprites/monsters/accessories/scythe-shadow.png (????) (GPLv2) - graphics/sprites/monsters/accessories/slime-littleslime.png (Wombat) (GPLv2) + graphics/sprites/monsters/accessories/slime-littleslime.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/sprites/monsters/accessories/slime-rudolph.png (????) (GPLv2) graphics/sprites/monsters/accessories/slime-santa.png (????) (GPLv2) - graphics/sprites/monsters/accessories/slime-seajelly.png (????) (GPLv2) + graphics/sprites/monsters/accessories/slime-seajelly.png (FotherJ) (GPLv2), (CC BY-SA 3.0) ## NPCs graphics/sprites/npcs/bones.png (FotherJ, Salmondine) (GPLv2) graphics/sprites/npcs/childoutfits.png (Milla, Mrgrey, Nami, Salmondine, Wombat) (GPLv2) @@ -855,9 +855,9 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/npc-woodenpump.png (Varuna) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npcs.png (????, Crush, Fate, Haay, Lien, Qwerty Dragon, Salmondine, Skipy, Wombat) (GPLv2) graphics/sprites/npcs/npcs2.png (Reig, Salmondine, Skipy) (GPLv2) - graphics/sprites/npcs/outfits.png (Wombat) (GPLv2) + graphics/sprites/npcs/outfits.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/poses.png (Lien, Meemixes, Salmondine, Wombat) (GPLv2) - graphics/sprites/npcs/saboteur.png (Wombat) (GPLv2) + graphics/sprites/npcs/saboteur.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/sages.png (Alige, Nami, Salmondine) (GPLv2) graphics/sprites/npcs/shapeshifter.png (Alige, Modanung) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/sittingsage.png (Alige, Nami) (GPLv2), (CC BY-SA 3.0) @@ -937,7 +937,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/Woodland_graveyard_ground.png (????, Crush) (GPLv2) graphics/tiles/Woodland_graveyard_x3.png (????, Black Don, Crush) (GPLv2) graphics/tiles/Woodland_graveyard_x4.png (????, Crush, Spit23) (GPLv2) - graphics/tiles/Woodland_ground.png (????, Crush, wombat, enchilado) (GPLv2) + graphics/tiles/Woodland_ground.png (????, Crush, Wombat, enchilado) (GPLv2) graphics/tiles/woodland_indoor_x2.png (????, Crush) (GPLv2) graphics/tiles/woodland_indoor_x3.png (????, Crush) (GPLv2) graphics/tiles/woodland_indoor.png (????, Crush, Yosuhara) (GPLv2) -- cgit v1.2.3-70-g09d2 From dc8bfdcfcd66fb24f3c3b35e6c57ef92a8bcae8b Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 8 Jul 2013 20:20:20 +0200 Subject: Fix spelling error. --- license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'license.txt') diff --git a/license.txt b/license.txt index b7c86b6f..f79aa454 100644 --- a/license.txt +++ b/license.txt @@ -854,7 +854,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/npc-weaver.png (ChefChelios) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-woodenpump.png (Varuna) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npcs.png (????, Crush, Fate, Haay, Lien, Qwerty Dragon, Salmondine, Skipy, Wombat) (GPLv2) - graphics/sprites/npcs/npcs2.png (Reig, Salmondine, Skipy) (GPLv2) + graphics/sprites/npcs/npcs2.png (Reid, Salmondine, Skipy) (GPLv2) graphics/sprites/npcs/outfits.png (Wombat) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/poses.png (Lien, Meemixes, Salmondine, Wombat) (GPLv2) graphics/sprites/npcs/saboteur.png (Wombat) (GPLv2), (CC BY-SA 3.0) -- cgit v1.2.3-70-g09d2 From 7fc892e550467a35e39977d445dfd3aba7ed3667 Mon Sep 17 00:00:00 2001 From: tux9th Date: Thu, 22 Aug 2013 22:37:31 +0200 Subject: Adding nightstand with plant to x2 tileset. Tux9th edited the file therefore adding him to the licence file. --- graphics/tiles/woodland_indoor_x2.png | Bin 9698 -> 11156 bytes license.txt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'license.txt') diff --git a/graphics/tiles/woodland_indoor_x2.png b/graphics/tiles/woodland_indoor_x2.png index 223b2251..3da4d781 100644 Binary files a/graphics/tiles/woodland_indoor_x2.png and b/graphics/tiles/woodland_indoor_x2.png differ diff --git a/license.txt b/license.txt index f79aa454..cf80c12a 100644 --- a/license.txt +++ b/license.txt @@ -938,7 +938,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/Woodland_graveyard_x3.png (????, Black Don, Crush) (GPLv2) graphics/tiles/Woodland_graveyard_x4.png (????, Crush, Spit23) (GPLv2) graphics/tiles/Woodland_ground.png (????, Crush, Wombat, enchilado) (GPLv2) - graphics/tiles/woodland_indoor_x2.png (????, Crush) (GPLv2) + graphics/tiles/woodland_indoor_x2.png (????, Crush, tux9th) (GPLv2) graphics/tiles/woodland_indoor_x3.png (????, Crush) (GPLv2) graphics/tiles/woodland_indoor.png (????, Crush, Yosuhara) (GPLv2) graphics/tiles/Woodland_swamp.png (Len) (GPLv2), (CC BY-SA 3.0) -- cgit v1.2.3-70-g09d2