From: Mircea Kitsune Date: Wed, 26 Oct 2011 12:49:56 +0000 (+0300) Subject: Adjust defaults. Also persist all menu settings (seta), which should make it easier... X-Git-Tag: xonotic-v0.6.0~35^2~18^2~151 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f65f535e2415dd009dc1f9b57c9dc326b1847db;p=xonotic%2Fxonotic-data.pk3dir.git Adjust defaults. Also persist all menu settings (seta), which should make it easier for some players I think --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 21de2f373..d220f7ba4 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -549,14 +549,14 @@ 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" seta menu_sandbox_spawn_model "" // used to store the model in the input field -set menu_sandbox_edit_skin 0 -set menu_sandbox_edit_alpha 1 -set menu_sandbox_edit_color_main "1 1 1" -set menu_sandbox_edit_color_glow "1 1 1" -set menu_sandbox_edit_frame 0 -set menu_sandbox_edit_scale 1 -set menu_sandbox_edit_physics 0 -set menu_sandbox_edit_force 0 +seta menu_sandbox_edit_skin 0 +seta menu_sandbox_edit_alpha 1 +seta menu_sandbox_edit_color_main "1 1 1" +seta menu_sandbox_edit_color_glow "1 1 1" +seta menu_sandbox_edit_frame 0 +seta menu_sandbox_edit_scale 1 +seta menu_sandbox_edit_physics 1 +seta menu_sandbox_edit_force 1 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools" bind f7 menu_showsandboxtools diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 6aa97b696..30e486895 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -31,7 +31,7 @@ entity sandbox_SpawnObject() e.realowner = self; e.classname = "object"; e.takedamage = DAMAGE_AIM; - e.damageforcescale = 0; + e.damageforcescale = 1; e.solid = SOLID_BBOX; // SOLID_BSP would be best, but can lag the server badly e.movetype = MOVETYPE_TOSS; e.frame = 0;