edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2548 from def-/pr-skins-license

Browse source 
Move skins license information to its own file
This commit is contained in:
Dennis Felsing 2020-08-10 19:36:56 +02:00 committed by GitHub
parent 0403e772ad d08535684e
commit 8239836a02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1205,6 +1205,7 @@ set(EXPECTED_DATA
skins/kitty_twintri.png
skins/kitty_warpaint.png
skins/kitty_x_ninja.png
skins/license.txt
skins/lightbulb.png
skins/limekitty.png
skins/mermydon-coala.png

51
data/skins/license.txt Normal file
View file

@ -0,0 +1,51 @@
bluekitty, bluestripe, brownbear, cammo, cammostripes, coala, default,
limekitty, pinky, redbopp, redstripe, saddo, toptri, twinbop, twintri,
warpaint:
Copyright Magnus Auvinen
zlib license
antiantey, beast, chinese_by_whis, dino, evil, evilwolfe, ghostjtj, ghost,
giraffe, greensward, greyfox, hammie-chew, hammie-whis, jeet, kintaro_2,
mermydon-coala, mermydon, mouse, musmann, nanami, oldman, oldschool, PaladiN,
penguin, random, veteran, voodoo_tee, whis:
Copyright Whis
CC-BY license
coala_bluekitty, coala_bluestripe, coala_cammo, coala_cammostripes,
coala_default, coala_limekitty, coala_pinky, coala_redbopp, coala_redstripe,
coala_saddo, coala_toptri, coala_twinbop, coala_twintri, coala_warpaint,
coala_x_ninja:
Copyright DanilBest
CC-BY-SA license
santa_bluekitty, santa_bluestripe, santa_brownbear, santa_cammo, santa_coala,
santa_default, santa_limekitty, santa_pinky, santa_redbopp, santa_redstripe,
santa_saddo, santa_toptri, santa_twinbop, santa_twintri, santa_warpaint:
Copyright forsaken
CC-BY-SA license
kitty_bluekitty, kitty_bluestripe, kitty_brownbear, kitty_cammo, kitty_coala,
kitty_default, kitty_limekitty, kitty_pinky, kitty_redbopp, kitty_redstripe,
kitty_saddo, kitty_toptri, kitty_twinbop, kitty_twintri, kitty_warpaint,
kitty_x_ninja:
Copyright Ravie
CC0 license
lightbulb, tank, emo, bunny, hedgehog, napoleon, roman, caesar, nosey, savage:
Copyright Lappi
CC-BY-NC-SA license
demonlimekitty, nanas, nersif:
Copyright Miper
CC-BY-SA license
wartee:
Copyright Obst
zlib license
Aoe4legs:
Copyright Aoe
CC0 license
All other skins:
All content is released under CC-BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/).

57
license.txt
View file

@ -20,8 +20,8 @@ freely, subject to the following restrictions:
------------------------------------------------------------------------
All content under 'data' except the font & skin files, (who have their own
licenses):
All content under 'data' except the font, language & skin files,
(which have their own licenses):
Apache 2.0 for the 'Icon.tff' file:
Copyright Google
@ -41,59 +41,6 @@ The other fonts are released under CC-BY-SA 3.0 (http://creativecommons.org/lice
------------------------------------------------------------------------
Content in data/skins:
bluekitty, bluestripe, brownbear, cammo, cammostripes, coala, default,
limekitty, pinky, redbopp, redstripe, saddo, toptri, twinbop, twintri,
warpaint:
Copyright Magnus Auvinen
zlib license
antiantey, beast, chinese_by_whis, dino, evil, evilwolfe, ghostjtj, ghost,
giraffe, greensward, greyfox, hammie-chew, hammie-whis, jeet, kintaro_2,
mermydon-coala, mermydon, mouse, musmann, nanami, oldman, oldschool, PaladiN,
penguin, random, veteran, voodoo_tee, whis:
Copyright Whis
CC-BY license
coala_bluekitty, coala_bluestripe, coala_cammo, coala_cammostripes,
coala_default, coala_limekitty, coala_pinky, coala_redbopp, coala_redstripe,
coala_saddo, coala_toptri, coala_twinbop, coala_twintri, coala_warpaint,
coala_x_ninja:
Copyright DanilBest
CC-BY-SA license
santa_bluekitty, santa_bluestripe, santa_brownbear, santa_cammo, santa_coala,
santa_default, santa_limekitty, santa_pinky, santa_redbopp, santa_redstripe,
santa_saddo, santa_toptri, santa_twinbop, santa_twintri, santa_warpaint:
Copyright forsaken
CC-BY-SA license
kitty_bluekitty, kitty_bluestripe, kitty_brownbear, kitty_cammo, kitty_coala,
kitty_default, kitty_limekitty, kitty_pinky, kitty_redbopp, kitty_redstripe,
kitty_saddo, kitty_toptri, kitty_twinbop, kitty_twintri, kitty_warpaint,
kitty_x_ninja:
Copyright Ravie
CC0 license
lightbulb, tank, emo, bunny, hedgehog, napoleon, roman, caesar, nosey, savage:
Copyright Lappi
CC-BY-NC-SA license
demonlimekitty, nanas, nersif:
Copyright Miper
CC-BY-SA license
wartee:
Copyright Obst
zlib license
Aoe4legs:
Copyright Aoe
CC0 license
------------------------------------------------------------------------
IMPORTANT NOTE! The source under src/engine/external are stripped
libraries with their own licenses. Mostly BSD or zlib/libpng license but
check the individual libraries.