From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 19 Oct 2010 05:44:40 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/falling_improvments'
X-Git-Tag: xonotic-v0.1.0preview~282
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d2509861580bce6e6f1ffc9e9a26aea2d70b6756;hp=4ab0cf346d44a5a817d309a32cd6174b38856d93

Merge remote branch 'refs/remotes/origin/mirceakitsune/falling_improvments'
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2a0a24b192..534daf164e 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -249,6 +249,11 @@ v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 cl_deathfade 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
 cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
+cl_bob2cycle 0 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
+cl_bob2 0.01 // how much view moves left/right when moving (does not move if cl_bob2cycle is 0), default is 0.01
+cl_bobfall 0.05 "how much the view swings down when falling (influenced by the speed you hit the ground with)"
+cl_bobfallcycle 3 "speed of the bobfall swing"
+cl_bobfallspeed 200 "necessary amount of speed for bob-falling to occur"
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 cl_leanmodel 1 // enables weapon leaning effect when looking around
 cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d88e0eba1d..d1d86ed79a 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -440,6 +440,7 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
 		_VOICEMSG(jump) \
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 44a47c95dc..3b7d77d58b 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -77,6 +77,10 @@ void CreatureFrame (void)
 				if (dm > 0)
 				{
 					Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');
+					// this must be allowed to cut the normal pain sounds (played after them and on the same channel)
+					// there's no way to detect falling damage and prevent the pain sounds for this to be played instead
+					if(self.health > 0)
+						PlayerSound(playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 				}
 			}
 
diff --git a/sound/misc/hitground1.ogg b/sound/misc/hitground1.ogg
index d3fdb8fe02..8cfae10f60 100644
Binary files a/sound/misc/hitground1.ogg and b/sound/misc/hitground1.ogg differ
diff --git a/sound/misc/hitground2.ogg b/sound/misc/hitground2.ogg
index 031ee35493..1f8a7441b4 100644
Binary files a/sound/misc/hitground2.ogg and b/sound/misc/hitground2.ogg differ
diff --git a/sound/misc/hitground3.ogg b/sound/misc/hitground3.ogg
index e139a0c7d7..73974a4de4 100644
Binary files a/sound/misc/hitground3.ogg and b/sound/misc/hitground3.ogg differ
diff --git a/sound/misc/hitground4.ogg b/sound/misc/hitground4.ogg
index 12e02cd00b..0c40620d16 100644
Binary files a/sound/misc/hitground4.ogg and b/sound/misc/hitground4.ogg differ
diff --git a/sound/misc/metalhitground1.ogg b/sound/misc/metalhitground1.ogg
index 8ae8803c14..03bee01090 100644
Binary files a/sound/misc/metalhitground1.ogg and b/sound/misc/metalhitground1.ogg differ
diff --git a/sound/misc/metalhitground2.ogg b/sound/misc/metalhitground2.ogg
index 4928c91e23..50f315f274 100644
Binary files a/sound/misc/metalhitground2.ogg and b/sound/misc/metalhitground2.ogg differ
diff --git a/sound/misc/metalhitground3.ogg b/sound/misc/metalhitground3.ogg
index 783e47cd40..0f3edb1060 100644
Binary files a/sound/misc/metalhitground3.ogg and b/sound/misc/metalhitground3.ogg differ
diff --git a/sound/misc/metalhitground4.ogg b/sound/misc/metalhitground4.ogg
index d4de286037..ad2b262557 100644
Binary files a/sound/misc/metalhitground4.ogg and b/sound/misc/metalhitground4.ogg differ
diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 6fa67648c3..368b64b420 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -26,6 +26,7 @@ FruitieX
 *Music / Sound FX
 mand1nga
 Merlijn Hofstra
+remaxim
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer