summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLedmitz <smoothshifter@tuta.io>2023-02-16 14:25:20 -0400
committerLedmitz <smoothshifter@tuta.io>2023-02-16 14:25:20 -0400
commit968bdbae500eff84c63e3dd2548b89d416e10f09 (patch)
treee8cae0d21eb83cdf17ea33e974007e463e212cd0
parent67956a8b9155efb3ba3634343ed8acf58324efe2 (diff)
downloadclientdata-968bdbae500eff84c63e3dd2548b89d416e10f09.tar.gz
clientdata-968bdbae500eff84c63e3dd2548b89d416e10f09.tar.bz2
clientdata-968bdbae500eff84c63e3dd2548b89d416e10f09.tar.xz
clientdata-968bdbae500eff84c63e3dd2548b89d416e10f09.zip
Revert "Added/corrected missing SFX in license"
This reverts commit 67956a8b9155efb3ba3634343ed8acf58324efe2.
-rw-r--r--license.md36
-rw-r--r--sfx/weapons/gunstaff/shot.oggbin0 -> 6377 bytes
2 files changed, 16 insertions, 20 deletions
diff --git a/license.md b/license.md
index 4b682a88..9d1fb174 100644
--- a/license.md
+++ b/license.md
@@ -1196,11 +1196,11 @@ File | Artists | Licenses
`sfx/monsters/bee/bee-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/casket-monster/casket-monster.ogg` | Dariuna | GPLv2
`sfx/monsters/cavesnake/cavesnake-hit1.ogg` | Krazyjakee | GPLv2
-`sfx/monsters/fallen/fallen-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/fallen/fallen-die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/fallen/fallen-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/fallen/fallen-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/fallen/fallen-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/fallen-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/fallen-die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/fallen-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/fallen-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/fallen-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/fire-goblin/fire-goblin-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fire-goblin/fire-goblin-hit2.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fire-goblin/fire-goblin-miss1.ogg` | Cosmostrator | GPLv2
@@ -1211,7 +1211,6 @@ File | Artists | Licenses
`sfx/monsters/flashmob/flashmob-move1.ogg` | Ledmitz (evil laugh-01.wav / Nanakisan / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/flashmob/flashmob-move2.ogg` | Ledmitz (evil laugh-01.wav / Nanakisan / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/flashmob/flashmob-move3.ogg` | Ledmitz (evil laugh-01.wav / Nanakisan / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/monsters/flashmob/flashmob-move4.ogg` | Ledmitz (evil laugh-01.wav / Nanakisan / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/flower/flower-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/flower/flower-hit2.ogg` | Cosmostrator | GPLv2
`sfx/monsters/flower/flower-miss1.ogg` | Cosmostrator | GPLv2
@@ -1294,8 +1293,6 @@ File | Artists | Licenses
`sfx/monsters/snail/snail-hit1.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snail/snail-hurt1.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snail/snail-hurt2.ogg` | alpha [Ledmitz] | GPLv2
-`sfx/monsters/snowman_boss/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/snowman_boss/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/spider/spider-die1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
`sfx/monsters/spider/spider-hit1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
@@ -1318,14 +1315,14 @@ File | Artists | Licenses
`sfx/monsters/terranite/terra-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/terranite/terra-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/terranite/terra-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/crit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tengu/hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-crit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/tengu/tengu-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/tengu/tengu-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/wolvern/wolvern-dying1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0
`sfx/monsters/wolvern/wolvern-hit1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0
@@ -1366,7 +1363,6 @@ File | Artists | Licenses
`sfx/system/ship-bell2.ogg` | unknown | (public domain)
`sfx/system/skillup02.ogg` | Ledmitz ([SFX] Angelic_ Choir_ Ahhhh_ Dm Chord (90bpm) (320kb).mp3 / TuneHntr_2Day / Sampling+ 1.0) | GPLv2, CC BY-SA 3.0
`sfx/system/warning.ogg` | Jesusalva | (public domain)
-`sfx/system/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1375,15 +1371,15 @@ File | Artists | Licenses
`sfx/weapons/bows/banshee/banshee-hit2.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/banshee/banshee-hit3.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/banshee/banshee-miss1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/banshee/banshee-miss2.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/banshee/banshee-miss3.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
+`sfx/weapons/bows/banshee/banshee-miss1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
+`sfx/weapons/bows/banshee/banshee-miss1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/forest/forest-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/forest/forest-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/short/short-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/short/short-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/bow-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/bow-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/gun/shot.ogg` | Bird-Man, Freesound.org, Jesusalva | CC 0
+`sfx/weapons/gunstaff/shot.ogg` | Bird-Man, Freesound.org, Jesusalva | CC 0
`sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/knives/rock/rock-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
diff --git a/sfx/weapons/gunstaff/shot.ogg b/sfx/weapons/gunstaff/shot.ogg
new file mode 100644
index 00000000..547b2739
--- /dev/null
+++ b/sfx/weapons/gunstaff/shot.ogg
Binary files differ