From: Mircea Kitsune Date: Wed, 26 Oct 2011 16:09:32 +0000 (+0300) Subject: Require a minimum velocity for material effects, on either the object or the entity... X-Git-Tag: xonotic-v0.6.0~35^2~18^2~138 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fe718be79ec21b69373e17e7ece9988f37d4ed8;p=xonotic%2Fxonotic-data.pk3dir.git Require a minimum velocity for material effects, on either the object or the entity colliding with it --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index ea06430d3..1415cd893 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -547,6 +547,7 @@ set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in fron set g_sandbox_editor_distance_edit 350 "distance at which players can edit or remove objects they are looking at" set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to" set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to" +set g_sandbox_object_matvel 50 "velocity objects must have while coliding for material effects to be applied" seta menu_sandbox_spawn_model "" // used to store the model in the input field seta menu_sandbox_edit_skin 0 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 9082b2d25..6a503d38c 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1204,3 +1204,4 @@ float autocvar_g_sandbox_editor_distance_spawn; float autocvar_g_sandbox_editor_distance_edit; float autocvar_g_sandbox_object_scale_min; float autocvar_g_sandbox_object_scale_max; +float autocvar_g_sandbox_object_matvel; diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 005cbb6a1..af39b1554 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -30,6 +30,9 @@ void sandbox_EditObject_Scale(entity e, float f) void sandbox_Object_Touch() { + if not(vlen(self.velocity) >= autocvar_g_sandbox_object_matvel || vlen(other.velocity) >= autocvar_g_sandbox_object_matvel) + return; + switch(self.material) { case MATERIAL_METAL: