Second requirement for merge; Add the effect to the menu and presets. I don't agree...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 23:18:40 +0000 (01:18 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 23:18:40 +0000 (01:18 +0200)
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
qcsrc/menu/xonotic/dialog_settings_effects.c

index 0e011fe..95fd0f8 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 4
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
index a9cff5a..e4391c7 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
+cl_damageeffect 0
 gl_flashblend 1
 gl_picmip 1
 gl_texture_anisotropy 1
index 5be8356..de41d38 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
+cl_damageeffect 0
 gl_flashblend 0
 gl_picmip 0
 gl_texture_anisotropy 1
index 0aebfb7..490087e 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip 0
 gl_texture_anisotropy 1
index 350e9b8..55a91e4 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 0
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
+cl_damageeffect 0
 gl_flashblend 1
 gl_picmip 1337
 gl_texture_anisotropy 1
index 7e4125b..8c859f0 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
+cl_damageeffect 2
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
index 1c9b9db..9dda230 100644 (file)
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
index 385252b..8c779bb 100644 (file)
@@ -110,6 +110,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
        me.TR(me);
+               me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Damage effects:")));
+               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "0", (_("Disabled"))));
+               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "1", _("Skeletal meshes")));
+               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "2", _("All meshes")));
+       me.TR(me);
                me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle quality:")));
                me.TD(me, 1, 1.9, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
        me.TR(me);