From: havoc Date: Tue, 13 May 2014 17:03:38 +0000 (+0000) Subject: Changed collision_enternudge and collision_leavenudge back to 0 because of massive... X-Git-Tag: xonotic-v0.8.0~64 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=221857c07ba261e8a9253a88f4c70f15ab5bbc42;p=xonotic%2Fdarkplaces.git Changed collision_enternudge and collision_leavenudge back to 0 because of massive sticking issues in terrain maps such as the Nexuiz 2.5.2 map ons-reborn. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12073 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=f42a37dfcbf93785b552c3ba3fb3ba7fdc793986 --- diff --git a/collision.c b/collision.c index cdcd08da..0797f26c 100644 --- a/collision.c +++ b/collision.c @@ -12,8 +12,8 @@ cvar_t collision_impactnudge = {0, "collision_impactnudge", "0.03125", "how much to back off from the impact"}; cvar_t collision_startnudge = {0, "collision_startnudge", "0", "how much to bias collision trace start"}; cvar_t collision_endnudge = {0, "collision_endnudge", "0", "how much to bias collision trace end"}; -cvar_t collision_enternudge = {0, "collision_enternudge", "0.03125", "how much to bias collision entry fraction"}; -cvar_t collision_leavenudge = {0, "collision_leavenudge", "0.03125", "how much to bias collision exit fraction"}; +cvar_t collision_enternudge = {0, "collision_enternudge", "0", "how much to bias collision entry fraction"}; +cvar_t collision_leavenudge = {0, "collision_leavenudge", "0", "how much to bias collision exit fraction"}; cvar_t collision_prefernudgedfraction = {0, "collision_prefernudgedfraction", "1", "whether to sort collision events by nudged fraction (1) or real fraction (0)"}; cvar_t collision_extendmovelength = {0, "collision_extendmovelength", "16", "internal bias on trace length to ensure detection of collisions within the collision_impactnudge/collision_enternudge/collision_leavenudge distance so that short moves do not degrade across frames (this does not alter the final trace length)"}; cvar_t collision_extendtraceboxlength = {0, "collision_extendtraceboxlength", "1", "internal bias for tracebox() qc builtin to account for collision_impactnudge/collision_enternudge/collision_leavenudge (this does not alter the final trace length)"};