diff options
| author | Saulc <lucashelaine14@gmail.com> | 2018-10-30 07:57:24 +0000 |
|---|---|---|
| committer | Saulc <lucashelaine14@gmail.com> | 2018-10-30 07:57:24 +0000 |
| commit | a4ec34c7c57241f328b79dcda8f65779c9e20ff7 (patch) | |
| tree | 52c437a47f5025200c562bd5b10e459152901e74 | |
| parent | ec12b76d2dc093b67db90d8f5d8c65dae58b073b (diff) | |
| parent | 742567ceccfb0bd59a88af5d1180f8055457eca4 (diff) | |
| download | art-a4ec34c7c57241f328b79dcda8f65779c9e20ff7.tar.gz art-a4ec34c7c57241f328b79dcda8f65779c9e20ff7.tar.bz2 art-a4ec34c7c57241f328b79dcda8f65779c9e20ff7.tar.xz art-a4ec34c7c57241f328b79dcda8f65779c9e20ff7.zip | |
Merge branch 'master' into 'master'
Media update
See merge request TMW2/Art!2
17 files changed, 14 insertions, 1 deletions
diff --git a/ART_LICENSE b/ART_LICENSE index efa3efea..865aaefb 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -41,7 +41,13 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Ambiant/xcf/desertclouds.xcf (Saulc) (CC BY-SA 3.0) (?) # Effect - NONE ACTUALLY +## Ready + Effects/ready/amulet.png (Reid, Saphy) (CC BY-SA 3.0) (-) + Effects/ready/blue-shield-1.png (Reid, Saphy) (CC BY-SA 3.0) (-) + Effects/ready/blue-shield-2.png (Reid) (CC BY-SA 3.0) (Saphy) + Effects/ready/spell-protection.png (Reid) (CC BY-SA 3.0) (Saphy) +## xcf + Effects/xcf/spell-protection.xcf (Reid) (CC BY-SA 3.0) (Saphy) # Emotes Emotes/_.png @@ -242,8 +248,15 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Sprites/Npcs/64x64/citizen.png (mishana) (CC BY-SA 3.0) (Saulc, ?) Sprites/Npcs/64x64/darkmage.png (mishana) (CC BY-SA 3.0) (Saulc, ?) Sprites/Npcs/64x64/saumonchest.png (mishana) (CC BY-SA 3.0) (Saulc, ?) + ### XCF + Sprites/Npcs/xcf/Bait.xcf(Reid) (CC BY-SA 3.0) (-) + Sprites/Npcs/xcf/Chelios_2.xcf (ChefChelios) (CC BY-SA 3.0) (Reid) + Sprites/Npcs/xcf/Chelios_2.xcf (ChefChelios) (CC BY-SA 3.0) (Reid) Sprites/Npcs/xcf/copperchest.xcf (Saulc) (CC BY-SA 3.0) (-) + Sprites/Npcs/xcf/Eugene_1.xcf (Reid) (CC BY-SA 3.0) (Kansu) + Sprites/Npcs/xcf/Eugene_2.xcf (Reid) (CC BY-SA 3.0) (Kansu) + Sprites/Npcs/xcf/Eugene_3.xcf (Reid) (CC BY-SA 3.0) (Kansu) ## model ### usable diff --git a/Effects/.gitkeep b/Effects/.gitkeep deleted file mode 100644 index e69de29b..00000000 --- a/Effects/.gitkeep +++ /dev/null diff --git a/Effects/ready/amulet.png b/Effects/ready/amulet.png Binary files differnew file mode 100644 index 00000000..8a6f1cc0 --- /dev/null +++ b/Effects/ready/amulet.png diff --git a/Effects/ready/blue-shield-1.png b/Effects/ready/blue-shield-1.png Binary files differnew file mode 100644 index 00000000..bed05604 --- /dev/null +++ b/Effects/ready/blue-shield-1.png diff --git a/Effects/ready/blue-shield-2.png b/Effects/ready/blue-shield-2.png Binary files differnew file mode 100644 index 00000000..22eed30a --- /dev/null +++ b/Effects/ready/blue-shield-2.png diff --git a/Effects/ready/spell-protection.png b/Effects/ready/spell-protection.png Binary files differnew file mode 100644 index 00000000..0a6c1526 --- /dev/null +++ b/Effects/ready/spell-protection.png diff --git a/Effects/xcf/spell-protection.xcf b/Effects/xcf/spell-protection.xcf Binary files differnew file mode 100644 index 00000000..e8465af0 --- /dev/null +++ b/Effects/xcf/spell-protection.xcf diff --git a/Sprites/Equipment/chests/xcf/legionarmor-female.xcf b/Sprites/Equipment/chests/xcf/legionarmor-female.xcf Binary files differnew file mode 100644 index 00000000..18126d0e --- /dev/null +++ b/Sprites/Equipment/chests/xcf/legionarmor-female.xcf diff --git a/Sprites/Equipment/chests/xcf/legionarmor-male.xcf b/Sprites/Equipment/chests/xcf/legionarmor-male.xcf Binary files differnew file mode 100644 index 00000000..dee73084 --- /dev/null +++ b/Sprites/Equipment/chests/xcf/legionarmor-male.xcf diff --git a/Sprites/Equipment/chests/xcf/vneckjumper-female.xcf b/Sprites/Equipment/chests/xcf/vneckjumper-female.xcf Binary files differnew file mode 100644 index 00000000..2cba98f0 --- /dev/null +++ b/Sprites/Equipment/chests/xcf/vneckjumper-female.xcf diff --git a/Sprites/Equipment/chests/xcf/vneckjumper-male.xcf b/Sprites/Equipment/chests/xcf/vneckjumper-male.xcf Binary files differnew file mode 100644 index 00000000..29618b9d --- /dev/null +++ b/Sprites/Equipment/chests/xcf/vneckjumper-male.xcf diff --git a/Sprites/Npcs/xcf/Bait.xcf b/Sprites/Npcs/xcf/Bait.xcf Binary files differnew file mode 100644 index 00000000..df3a994a --- /dev/null +++ b/Sprites/Npcs/xcf/Bait.xcf diff --git a/Sprites/Npcs/xcf/Chelios_1.xcf b/Sprites/Npcs/xcf/Chelios_1.xcf Binary files differnew file mode 100644 index 00000000..1105989f --- /dev/null +++ b/Sprites/Npcs/xcf/Chelios_1.xcf diff --git a/Sprites/Npcs/xcf/Chelios_2.xcf b/Sprites/Npcs/xcf/Chelios_2.xcf Binary files differnew file mode 100644 index 00000000..62daab6e --- /dev/null +++ b/Sprites/Npcs/xcf/Chelios_2.xcf diff --git a/Sprites/Npcs/xcf/Eugene_1.xcf b/Sprites/Npcs/xcf/Eugene_1.xcf Binary files differnew file mode 100644 index 00000000..7b78dbdd --- /dev/null +++ b/Sprites/Npcs/xcf/Eugene_1.xcf diff --git a/Sprites/Npcs/xcf/Eugene_2.xcf b/Sprites/Npcs/xcf/Eugene_2.xcf Binary files differnew file mode 100644 index 00000000..9b69ea66 --- /dev/null +++ b/Sprites/Npcs/xcf/Eugene_2.xcf diff --git a/Sprites/Npcs/xcf/Eugene_3.xcf b/Sprites/Npcs/xcf/Eugene_3.xcf Binary files differnew file mode 100644 index 00000000..152ef13f --- /dev/null +++ b/Sprites/Npcs/xcf/Eugene_3.xcf |
