Merge remote branch 'refs/remotes/origin/fruitiex/silencedriflesec'

diff --git a/effectinfo.txt b/effectinfo.txt
index e78e636a4501e04e2e69c69259a01d415e1e06c3..b36570aab4865bcd52cdabb25186d7b059b04fd9 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4676,8 +4676,8 @@ trailspacing 16
 type static
 color 0x202020 0x404040
 size 2 2
-sizeincrease 2
-alpha 256 256 512
+sizeincrease 0.2
+alpha 256 256 256
 airfriction -4
 velocityjitter 4 4 4
 type smoke
@@ -4688,7 +4688,7 @@ type bubble
 tex 62 62
 color 0x404040 0x808080
 size 1 1
-alpha 256 256 256
+alpha 256 256 128
 gravity -0.125
 bounce 1.5
 liquidfriction 4

diff --git a/sound/weapons/campingrifle_fire2.ogg b/sound/weapons/campingrifle_fire2.ogg
deleted file mode 100644 (file)
index 721b37b..0000000
Binary files a/sound/weapons/campingrifle_fire2.ogg and /dev/null differ

diff --git a/sound/weapons/campingrifle_fire2.wav b/sound/weapons/campingrifle_fire2.wav
new file mode 100644 (file)
index 0000000..66bda4f
Binary files /dev/null and b/sound/weapons/campingrifle_fire2.wav differ