Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into The-eugher
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaspatik committed Nov 27, 2024
2 parents 00cc55a + 7d5f9fb commit a0be02c
Show file tree
Hide file tree
Showing 12 changed files with 136 additions and 132 deletions.
190 changes: 95 additions & 95 deletions HOW TO ADD SOUNDS.txt
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
https://github.com/Metastruct/garrysmod-chatsounds
1. Fork the repository: https://help.github.com/articles/fork-a-repo/
=== using GitHub for Windows: https://windows.github.com/ ===
2. Click the "Clone in Desktop" button on https://github.com/Metastruct/garrysmod-chatsounds
( or if you forked: https://github.com/YOUR_USERNAME/garrysmod-chatsounds )
=== using TortoiseSVN: http://tortoisesvn.net/downloads.html ===
2. Right click in your addons folder and "SVN Checkout..." the url: https://github.com/Metastruct/garrysmod-chatsounds/trunk
( or if you forked: https://github.com/YOUR_USERNAME/garrysmod-chatsounds/trunk )
3. Add the sounds using the preferred format.
=============================================
format : ogg
ogg quality : ~30% / ~3
sample rate : 44.1 kHz
channels : mono (if it's music use stereo)
bit depth : 16 bit
=============================================
- Must follow Github's AUP
- Name your folders properly, this involves naming the folder after a category that fits all of its contained sounds
- "Personalized folders" are to be avoided, do not just shove whatever inside a folder with your name
- Ensure that you can spell
4. Make sure you remove left over files that aren't ogg files
5. If necessary, you can add a "map.txt" into the folder that contains lines formatted like this:
[source] ; [dest]
or like this
[source] ; [dest]; replace
[source] is the sound name that you want to copy or move
[dest] is the sound name that you want to copy or move to
'replace' is a keyword that you can add to move instead of copy
The file is executed from top to bottom.
"sound name" can refer to either single sounds or entire sound groups.
If [dest] exists already, [source] will be added/merged (see the example below).
If you have a sound named "single" and a sound group "multi", you could, for example, create such a map:
single; single2
single ;single3
single2;single4
single; single1; replace
multi; multiple; replace
single1; multiple
This would change the generated list from the default:
single = single.ogg; multi = {multi/1.ogg, multi/2.ogg}
to something like this:
single1 = single.ogg
single2 = single.ogg
single3 = single.ogg
single4 = single.ogg
multiple = {multi/1.ogg, multi/2.ogg, single.ogg}
Note, you can't add a line like "single; singleX" to the bottom of this example file because at that point "single"
doesn't exist anymore (it has been moved in line 4 ("single; single1; replace" <- note the "replace" keyword))
6. Run "chatsounds-preprocessor.exe" in the root of the repo ( optional, will be generated by a CI script
and committed as a separate commit in case you don't run it )
7. Commit!! ( and Sync if using GitHub for Windows )
8. If you forked you will need to create a "Pull Request": https://help.github.com/articles/creating-a-pull-request/
( if using GitHub for Windows you can click the button to the left of "Sync" to do a pull request
but be sure to select "Metastruct/master" as the destination branch )
You can use Audacity, foobar2000 or Adobe Audition to convert to ogg.
HOW TO CONVERT STEREO TRACKS TO MONO IN AUDACITY:
1. Select the track by clicking in its Track Control Panel
2. Click Tracks > Stereo Track to Mono
HOW TO CHANGE OGG QUALITY IN AUDACITY:
1. Click on "File" > "Export"
2. Select "Ogg Vorbis Files" in the "Save as type" drop-down menu.
3. Click on "Options..."
4. Adjust the slider and set it to 3
5. Press OK
HOW TO CONVERT WITH FOOBAR2000:
1. Right click on desired track, then Convert -> Quick Convert
2. Select "Ogg Vorbis", then press Edit and set Quality to q3.0
3. Press OK, then Convert
4. At this step you will be required to specify path to oggenc2, if you haven't done it already.
Download it from here: http://www.rarewares.org/files/ogg/oggenc2.87-1.3.3-generic.zip
Put it in some folder and specify path to it when foobar2000 prompts for it.
In Adobe Audition it helps to make markers and name markers that you can export all at once in the end.
In Audacity you can attach marker to current selection by pressing Ctrl-B.
https://github.com/Metastruct/garrysmod-chatsounds

1. Fork the repository: https://help.github.com/articles/fork-a-repo/

=== using GitHub for Windows: https://windows.github.com/ ===
2. Click the "Clone in Desktop" button on https://github.com/Metastruct/garrysmod-chatsounds
( or if you forked: https://github.com/YOUR_USERNAME/garrysmod-chatsounds )

=== using TortoiseSVN: http://tortoisesvn.net/downloads.html ===
2. Right click in your addons folder and "SVN Checkout..." the url: https://github.com/Metastruct/garrysmod-chatsounds/trunk
( or if you forked: https://github.com/YOUR_USERNAME/garrysmod-chatsounds/trunk )

3. Add the sounds using the preferred format.

=============================================
format : ogg
ogg quality : ~30% / ~3
sample rate : 44.1 kHz
channels : mono (if it's music use stereo)
bit depth : 16 bit
=============================================

- Must follow Github's AUP
- Name your folders properly, this involves naming the folder after a category that fits all of its contained sounds
- "Personalized folders" are to be avoided, do not just shove whatever inside a folder with your name
- Ensure that you can spell

4. Make sure you remove left over files that aren't ogg files
5. If necessary, you can add a "map.txt" into the folder that contains lines formatted like this:
[source] ; [dest]
or like this
[source] ; [dest]; replace
[source] is the sound name that you want to copy or move
[dest] is the sound name that you want to copy or move to
'replace' is a keyword that you can add to move instead of copy
The file is executed from top to bottom.
"sound name" can refer to either single sounds or entire sound groups.
If [dest] exists already, [source] will be added/merged (see the example below).

If you have a sound named "single" and a sound group "multi", you could, for example, create such a map:
single; single2
single ;single3
single2;single4
single; single1; replace
multi; multiple; replace
single1; multiple

This would change the generated list from the default:
single = single.ogg; multi = {multi/1.ogg, multi/2.ogg}
to something like this:
single1 = single.ogg
single2 = single.ogg
single3 = single.ogg
single4 = single.ogg
multiple = {multi/1.ogg, multi/2.ogg, single.ogg}

Note, you can't add a line like "single; singleX" to the bottom of this example file because at that point "single"
doesn't exist anymore (it has been moved in line 4 ("single; single1; replace" <- note the "replace" keyword))

6. Run "chatsounds-preprocessor.exe" in the root of the repo ( optional, will be generated by a CI script
and committed as a separate commit in case you don't run it )
7. Commit!! ( and Sync if using GitHub for Windows )

8. If you forked you will need to create a "Pull Request": https://help.github.com/articles/creating-a-pull-request/
( if using GitHub for Windows you can click the button to the left of "Sync" to do a pull request
but be sure to select "Metastruct/master" as the destination branch )


You can use Audacity, foobar2000 or Adobe Audition to convert to ogg.

HOW TO CONVERT STEREO TRACKS TO MONO IN AUDACITY:

1. Select the track by clicking in its Track Control Panel
2. Click Tracks > Stereo Track to Mono

HOW TO CHANGE OGG QUALITY IN AUDACITY:

1. Click on "File" > "Export"
2. Select "Ogg Vorbis Files" in the "Save as type" drop-down menu.
3. Click on "Options..."
4. Adjust the slider and set it to 3
5. Press OK

HOW TO CONVERT WITH FOOBAR2000:

1. Right click on desired track, then Convert -> Quick Convert
2. Select "Ogg Vorbis", then press Edit and set Quality to q3.0
3. Press OK, then Convert
4. At this step you will be required to specify path to oggenc2, if you haven't done it already.
Download it from here: http://www.rarewares.org/files/ogg/oggenc2.87-1.3.3-generic.zip
Put it in some folder and specify path to it when foobar2000 prompts for it.


In Adobe Audition it helps to make markers and name markers that you can export all at once in the end.
In Audacity you can attach marker to current selection by pressing Ctrl-B.
70 changes: 35 additions & 35 deletions HOW TO USE MODIFIERS.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
===============================================
Default Chatsound Volume: (75)
Volume range: (0 - 100)
Default Chatsound Pitch range: (95 - 105)
Pitch range: (0 - 255)
===============================================
! (Louder volume)
!! (Even Louder volume)
!!! (WHAT???)
?? (Change pitch depending on eye angle pitch)
% (pitch set)
%%x.x (pitch(x) to pitch(x) fade)
^ (volume set)
^^x.x (volume(x) to volume(x) fade)
# (specific chatsound if multiples exist)
##x (chatsound from that folder(x) if it exists)
& (DSP mod)
--x (interupts the sound when (x)% of the sound has been played)
=x (play next sound after (x) seconds)
%0.1?? (loops sound with pitch changing depending on eye angle pitch)
%%100.101=x (loop sound at 100% pitch for (x) seconds)
++x (starts sound (x)% in (this one never works though))

===============================================
Default Chatsound Volume: (75)
Volume range: (0 - 100)

Default Chatsound Pitch range: (95 - 105)
Pitch range: (0 - 255)
===============================================

! (Louder volume)
!! (Even Louder volume)
!!! (WHAT???)

?? (Change pitch depending on eye angle pitch)

% (pitch set)
%%x.x (pitch(x) to pitch(x) fade)

^ (volume set)
^^x.x (volume(x) to volume(x) fade)

# (specific chatsound if multiples exist)
##x (chatsound from that folder(x) if it exists)

& (DSP mod)

--x (interupts the sound when (x)% of the sound has been played)

=x (play next sound after (x) seconds)

%0.1?? (loops sound with pitch changing depending on eye angle pitch)

%%100.101=x (loop sound at 100% pitch for (x) seconds)

++x (starts sound (x)% in (this one never works though))
Empty file modified chatsounds-preprocessor.cmd
100755 → 100644
Empty file.
5 changes: 5 additions & 0 deletions lua/chatsounds/lists_nosend/gambling.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
c.StartList("gambling")
L["aw dangit"]={{path="chatsounds/autoadd/gambling/aw dangit.ogg",length=0.923}}
L["buzz"]={{path="chatsounds/autoadd/gambling/buzz.ogg",length=0.716}}
L["lets go gambling"]={{path="chatsounds/autoadd/gambling/lets go gambling.ogg",length=1.466}}
c.EndList()
1 change: 0 additions & 1 deletion lua/chatsounds/lists_nosend/matrix.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ L["really"]={{path="chatsounds/autoadd/matrix/really.ogg",length=0.677}}
L["right"]={{path="chatsounds/autoadd/matrix/right.ogg",length=0.506}}
L["she is going to die and there is nothing you can do to stop it"]={{path="chatsounds/autoadd/matrix/she is going to die and there is nothing you can do to stop it.ogg",length=4.863}}
L["simultaneously the source of your greatest strength and your greatest weakness"]={{path="chatsounds/autoadd/matrix/simultaneously the source of your greatest strength and your greatest weakness.ogg",length=4.414}}
L["some believe that we lacked the programming language to describe your perfect world but i believe as a species human beings define their reality through misery and suffering"]={{path="chatsounds/autoadd/matrix/some believe that we lacked the programming language to describe your perfect world but i believe as a species human beings define their reality through misery and suffering.ogg",length=14.618}}
L["temporary constructs of a feeble human intellect trying desperately to justify an existence that is without meaning or purpose"]={{path="chatsounds/autoadd/matrix/temporary constructs of a feeble human intellect trying desperately to justify an existence that is without meaning or purpose.ogg",length=7.667}}
L["that was quicker than the others"]={{path="chatsounds/autoadd/matrix/that was quicker than the others.ogg",length=1.604}}
L["the all knowing oracle is never surprised how can she be she knows everything"]={{path="chatsounds/autoadd/matrix/the all knowing oracle is never surprised how can she be she knows everything.ogg",length=4.991}}
Expand Down
2 changes: 1 addition & 1 deletion lua/chatsounds/lists_nosend/memes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ L["arabic nokia ringtone"]={{path="chatsounds/autoadd/memes/arabic nokia rington
L["are red"]={{path="chatsounds/autoadd/memes/are red.ogg",length=0.880}}
L["are ya winning son"]={{path="chatsounds/autoadd/memes/are ya winning son.ogg",length=1.549}}
L["are you fucking kidding me"]={{path="chatsounds/autoadd/memes/are you fucking kidding me.ogg",length=1.406}}
L["are you guys going trick or treating"]={{path="chatsounds/autoadd/memes/are you guys going trick or treating.ogg",length=1.919}}
L["are you guys going trick or treating"]={{path="chatsounds/autoadd/memes/are you guys going trick or treating.ogg",length=1.796}}
L["arrgh eww duude wtf"]={{path="chatsounds/autoadd/memes/arrgh eww duude wtf.ogg",length=6.332}}
L["attention all libtards"]={{path="chatsounds/autoadd/memes/attention all libtards.ogg",length=2.199}}
L["autotune puke"]={{path="chatsounds/autoadd/memes/autotune puke.ogg",length=3.462}}
Expand Down
Empty file modified repo-reset.cmd
100755 → 100644
Empty file.
Binary file not shown.
Binary file added sound/chatsounds/autoadd/gambling/buzz.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit a0be02c

Please sign in to comment.