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 #2577

Browse source 
2577: Add back skins by Moby Dog r=def- a=heinrich5991

CC #2518

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2020-08-14 16:10:01 +00:00 committed by GitHub
parent 220c6b240f 63c26d25ee
commit c900c035d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -1142,7 +1142,15 @@ set(EXPECTED_DATA
shader/tile.vert
shader/tiletex.frag
shader/tiletex.vert
"skins/Ablush NeoN.png"
skins/Aoe4leg.png
"skins/Apish Coke.png"
"skins/Black Phantom heinrich5991.png"
"skins/Evil Puffi.png"
"skins/Flying Silex.png"
"skins/Hidden Assassin.png"
"skins/Irradiated Sunny.png"
"skins/Mobys Skull.png"
skins/PaladiN.png
skins/Terrorist.png
skins/antiantey.png

BIN
data/skins/Ablush NeoN.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
data/skins/Apish Coke.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
data/skins/Black Phantom heinrich5991.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
data/skins/Evil Puffi.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
data/skins/Flying Silex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
data/skins/Hidden Assassin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
data/skins/Irradiated Sunny.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
data/skins/Mobys Skull.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.6 KiB

7
data/skins/license.txt
View file

@ -47,5 +47,12 @@ Aoe4legs:
Copyright Aoe
CC0 license
Ablush NeoN, Apish Coke, Black Phantom heinrich5991, Evil Puffi, Flying Silex,
Hidden Assassin, Irradiated Sunny, Mobys Skull:
Copyright Moby Dog
CC-BY-NC-ND license
Permission to modify the skins to fit other skin systems (split it into parts,
etc.) and publish them under the same license was given.
All other skins:
All content is released under CC-BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/).