diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
| commit | 6de854e3b43fedbf7be5c914b6f05812766ccfde (patch) | |
| tree | 9abba21bae5d9a157c8295c56a0034dd0563b9ff /license.txt | |
| parent | 3061d90f72f8e374e457eec9c2b1a32b94b80e0b (diff) | |
| parent | fa86b982fd820a4cf7112719bd721db0dc811b28 (diff) | |
| download | clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.gz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.bz2 clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.xz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.zip | |
Merge remote-tracking branch 'wushin/tonori-cave-release'
Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
Diffstat (limited to 'license.txt')
| -rw-r--r-- | license.txt | 159 |
1 files changed, 86 insertions, 73 deletions
diff --git a/license.txt b/license.txt index 062183cc..6d350f88 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, 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) - 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, 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) + 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) |