Patches #960

Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/new_sounds

Added by git-manager over 2 years ago. Updated 2 months ago.

Status:ClosedStart date:01/03/2012
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:Xonotic - 1.0

Description

Purpose of the branch:

Better sounds for weapon, ammo, health and armor pickups, as well as a new weapon switching sound. Some sounds were made or edited by me, while others were taken from various websites, and checked to be license compatible. Links to the sounds I used below:

http://www.pdsounds.org/sounds/buzzing_parking_ticket_aparatus
http://opengameart.org/content/equipment-clicks-ii
http://opengameart.org/content/inventory-sound-effects

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 6b49050a27d19fce7e59528e2a1b06a01bfa0b48
Branch: mirceakitsune/new_sounds

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '6b49050a27d19fce7e59528e2a1b06a01bfa0b48'..'origin/mirceakitsune/new_sounds'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/mirceakitsune/new_sounds'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'mirceakitsune/new_sounds'

Diffstat:

 sound/misc/armor1.wav           |  Bin 52034 -> 52034 bytes
 sound/misc/armor10.wav          |  Bin 60164 -> 60164 bytes
 sound/misc/armor17_5.wav        |  Bin 89528 -> 89528 bytes
 sound/misc/armor25.wav          |  Bin 158536 -> 158536 bytes
 sound/misc/itempickup.ogg       |  Bin 8043 -> 11970 bytes
 sound/misc/mediumhealth.ogg     |  Bin 7957 -> 18979 bytes
 sound/misc/megahealth.ogg       |  Bin 34116 -> 23638 bytes
 sound/misc/minihealth.ogg       |  Bin 7231 -> 15467 bytes
 sound/weapons/weapon_switch.ogg |  Bin 7495 -> 16720 bytes
 sound/weapons/weaponpickup.ogg  |  Bin 9915 -> 12455 bytes
 xonotic-credits.txt             |    2 ++
 11 files changed, 2 insertions(+), 0 deletions(-)

Revision log:

commit 6b49050a27d19fce7e59528e2a1b06a01bfa0b48
Merge: 18884a4 6796c18
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/new_sounds

    Conflicts:
        xonotic-credits.txt

commit 18884a4361c893a8cc004fb1df6067d5c966ac25
Merge: 1280a36 e97635c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/new_sounds

commit 1280a36a40161145b764a20ca8960a46d5b9f7ba
Merge: 6fcc9de 166e96f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/new_sounds

commit 6fcc9de9c510ae7bf915310d0f89fc9b22cdb3b1
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Add the authors of the sounds I used to the credits

commit 8d331a34f93b77fa73a32c58195254c3a718998a
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Revert "Use a sound from a previous package for a better falling effect (hitground). Use a different sound for weapon switching." - The hitground sounds sound better as they were previously.

commit fd72f982fafa80a765130cb559e9ebad8dac3419
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use a sound from a previous package for a better falling effect (hitground). Use a different sound for weapon switching.

commit 8454aceeef5189e981385236f2a59192db2b03c3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use a mechanical sound for the armor instead (to give the feeling of a self-installing suit). Original sound from http://www.pdsounds.org/sounds/buzzing_parking_ticket_aparatus Yes, I filtered it from a parking ticket machine xD

commit dfa862af18b96192fb51098ad8286fe0a832106c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Attempt to add a charge like sound to armor pickups. Not sure about how this sounds though...

commit f509c3a5f8eacc0188a6f23c6f2e4baa53d265d3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Lower pitch for the new health sounds

commit 32f2a2ebad82a01baafbaaf53f1fbe5ef47fa114
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Some improvements to the health sounds

commit 19747001e6fbcb057addaaac4a188eac7fef450a
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Add some effects to the health pickup sounds

commit 9263f5e8c2d3601a382558bba9b4384f9753c929
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Better weapon and ammo pickup sounds, from http://opengameart.org/content/equipment-clicks-ii

commit ef31da6ff43c747ff617a5d51626c110658c8182
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    New weapon switch sound. Taken from http://opengameart.org/content/inventory-sound-effects

User agreed to the GPLv2+.

Diff:

diff --git a/sound/misc/armor1.wav b/sound/misc/armor1.wav
index 4ee6230..ca90baa 100644
Binary files a/sound/misc/armor1.wav and b/sound/misc/armor1.wav differ
diff --git a/sound/misc/armor10.wav b/sound/misc/armor10.wav
index 7ba2edf..1175be9 100644
Binary files a/sound/misc/armor10.wav and b/sound/misc/armor10.wav differ
diff --git a/sound/misc/armor17_5.wav b/sound/misc/armor17_5.wav
index eafad59..a5ab5b8 100644
Binary files a/sound/misc/armor17_5.wav and b/sound/misc/armor17_5.wav differ
diff --git a/sound/misc/armor25.wav b/sound/misc/armor25.wav
index 9aea70c..1d27a28 100644
Binary files a/sound/misc/armor25.wav and b/sound/misc/armor25.wav differ
diff --git a/sound/misc/itempickup.ogg b/sound/misc/itempickup.ogg
index e9a780b..216f4d4 100644
Binary files a/sound/misc/itempickup.ogg and b/sound/misc/itempickup.ogg differ
diff --git a/sound/misc/mediumhealth.ogg b/sound/misc/mediumhealth.ogg
index f04e8d6..9333860 100644
Binary files a/sound/misc/mediumhealth.ogg and b/sound/misc/mediumhealth.ogg differ
diff --git a/sound/misc/megahealth.ogg b/sound/misc/megahealth.ogg
index 6b250eb..de5b473 100644
Binary files a/sound/misc/megahealth.ogg and b/sound/misc/megahealth.ogg differ
diff --git a/sound/misc/minihealth.ogg b/sound/misc/minihealth.ogg
index 502b34a..dc4e35a 100644
Binary files a/sound/misc/minihealth.ogg and b/sound/misc/minihealth.ogg differ
diff --git a/sound/weapons/weapon_switch.ogg b/sound/weapons/weapon_switch.ogg
index 5a7756b..81eeaca 100644
Binary files a/sound/weapons/weapon_switch.ogg and b/sound/weapons/weapon_switch.ogg differ
diff --git a/sound/weapons/weaponpickup.ogg b/sound/weapons/weaponpickup.ogg
index 4e1c1fb..7e2db9c 100644
Binary files a/sound/weapons/weaponpickup.ogg and b/sound/weapons/weaponpickup.ogg differ
diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 2e60c67..1b38658 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -39,6 +39,8 @@ mand1nga
 Merlijn Hofstra
 remaxim
 Stephan
+LFA
+artisticdude
 Independent.nu

 *Engine Code Additions & QA

History

#1 Updated by divVerent over 2 years ago

Anyone tried them yet?

#2 Updated by C.Brutail over 2 years ago

I tried them. I'm not sure if I should hear some sounds mixed together with the old ones, but honestly, I don't like them, sorry Taoki :(

#3 Updated by kuniu_the_frogg over 2 years ago

Armour pickups have quite nice new techy touch.
Health pickups are too similiar to each other, would be hard to distinguish whether your enemy just picked MH or 25H.
Also, sound played while switching weapons is a bit annoying (though i know it may be because i'm used to the old one).

#4 Updated by merlijn over 2 years ago

  • Target version set to 1.0

Setting this for version 1.0 as the change is too controversial to merge this for 0.6

#5 Updated by Mario 2 months ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

Merging the old sounds over most of them kinda defeats the purpose of adding new sounds...
Maybe make a new request without the old sounds merged in?

Also available in: Atom PDF