Second requirement for merge; Add the effect to the menu and presets. I don't agree...

diff --git a/effects-high.cfg b/effects-high.cfg
index 0e011fe56be28f6516e54bd5cf76fab65031acac..95fd0f8bd1ae39c8d66e3558e8704f1d47f391eb 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -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

diff --git a/effects-low.cfg b/effects-low.cfg
index a9cff5abe5e85b3f5bd38c64bd5a5293cda43e89..e4391c703d4ed00be4f1191c4abf6c9888c9eb38 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -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

diff --git a/effects-med.cfg b/effects-med.cfg
index 5be8356e2e11c52fca16d0f258372bb05eaddd9f..de41d388cc89e460636d6f301038b36528f49162 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -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

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 0aebfb79dfd709737399f73b5e83721720415bda..490087efdf070f9218fb702d92384b1d57934a1a 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -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

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 350e9b8497afd77ae4b187b01d1e1e7b9fa4ed55..55a91e45092ac3058d46bdcf215e7947cae69371 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -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

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 7e4125bf45bf224371e234cf601e70c2e46ff1df..8c859f08d971a3a1ba5b432ded2d2fd62383f4f4 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -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

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 1c9b9db3012a4f9d05d76aacac7180feea54880e..9dda230cad36e1773a39083b3cc46b33d67d2fd4 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -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

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 385252bcb106f9d1c432212b8042a8792ccfa8c6..8c779bb6ebb794089aaa98f13885045f66b45dba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -109,6 +109,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        e.addValue(e, _("16x"), "16");
                        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"));