Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
	qcsrc/menu/xonotic/dialog_settings_effects.c

diff --cc defaultXonotic.cfg
Simple merge

diff --cc effects-high.cfg
index 6d31da3ec4587b0650c64f73a8e4e87d591299dd,95fd0f8bd1ae39c8d66e3558e8704f1d47f391eb..65ef997b26aa34996369b095825ef37e9f429194
--- 1/effects-high.cfg
--- 2/effects-high.cfg
+++ b/effects-high.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 0
  r_bloom 1
  r_coronas 1

diff --cc effects-low.cfg
index c28654fdb2b22c60af6b5debc455e1f40889def3,e4391c703d4ed00be4f1191c4abf6c9888c9eb38..4b0cf628198fbb80add620134d97be16a9ff41af
--- 1/effects-low.cfg
--- 2/effects-low.cfg
+++ b/effects-low.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 1
  r_bloom 0
  r_coronas 1

diff --cc effects-med.cfg
index 91ac6e791ae2cb2d2b40d270d9597c450c74cd0b,de41d388cc89e460636d6f301038b36528f49162..e4882b8c00f68701d8e0ecb4c03cb81206c27b31
--- 1/effects-med.cfg
--- 2/effects-med.cfg
+++ b/effects-med.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 0
  r_bloom 0
  r_coronas 1

diff --cc effects-normal.cfg
index a488c694fec5222a6b32df17317f47d08a155350,490087efdf070f9218fb702d92384b1d57934a1a..64543bcc42d45bd6d75c222b344c4f2c7bfc799c
--- 1/effects-normal.cfg
--- 2/effects-normal.cfg
+++ b/effects-normal.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 0
  r_bloom 0
  r_coronas 1

diff --cc effects-omg.cfg
index 5fb38a2ea336c94aa9b2d2c4ba4a861e0ce0d646,55a91e45092ac3058d46bdcf215e7947cae69371..902266ca4830d505a8575d992076adb3d6b6ca70
--- 1/effects-omg.cfg
--- 2/effects-omg.cfg
+++ b/effects-omg.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 1
  r_bloom 0
  r_coronas 1

diff --cc effects-ultimate.cfg
index 63dfc5cb197606d6fcb5a276d9f4832c7c5db491,8c859f08d971a3a1ba5b432ded2d2fd62383f4f4..ec949193cf919b8192e7e8c2669878a52fc8ecd3
--- 1/effects-ultimate.cfg
--- 2/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 0
  r_bloom 1
  r_coronas 1

diff --cc effects-ultra.cfg
index 359f67081871011b9c1be77a98e3a44c4679af18,9dda230cad36e1773a39083b3cc46b33d67d2fd4..48c17c3a31eb5961a510d3872f9f9b20d650c16e
--- 1/effects-ultra.cfg
--- 2/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@@ -2,8 -2,10 +2,9 @@@ cl_decals 
  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
  mod_q3bsp_nolightmaps 0
  r_bloom 1
  r_coronas 1

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_effects.c
index 2bf13ca941864c8e46758e674aad0c617e11f9ba,4e5a9088cbdbeeef67b27407dd343a97ccbc3846..449d0b6e5b3fc68739c3ee9d18816f96e6e759ea
--- 1/qcsrc/menu/xonotic/dialog_settings_effects.c
--- 2/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@@ -89,22 -100,31 +89,29 @@@ void XonoticEffectsSettingsTab_fill(ent
                        }
                }
        me.TR(me);
 -      me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Anisotropy:")));
 -              me.TD(me, 1, 2, e = makeXonoticTextSlider("gl_texture_anisotropy"));
 -                      e.addValue(e, ZCTX(_("ANISO^Disabled")), "1");
 -                      e.addValue(e, _("2x"), "2");
 -                      e.addValue(e, _("4x"), "4");
 -                      e.addValue(e, _("8x"), "8");
 -                      e.addValue(e, _("16x"), "16");
 -                      e.configureXonoticTextSliderValues(e);
 +              me.TD(me, 1, 1, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps")));
 +              me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping")));
 +                      setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
 +              me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss")));
 +                      setDependentAND3(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0, "r_glsl_deluxemapping", 1, 1);
        me.TR(me);
        me.TR(me);
 -              me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle quality:")));
 +              me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles quality:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
        me.TR(me);
 -              me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle distance:")));
 +              me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles distance:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
 -      me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Damage effects:")));
++      me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Damage effects:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
 -                      e.addValue(e, _("Disabled"), "0");
 -                      e.addValue(e, _("Skeletal"), "1");
 -                      e.addValue(e, _("All"), "2");
++                      e.addValue(e, ZCTX(_("DMGPRTCLS^Disabled")), "0");
++                      e.addValue(e, ZCTX(_("DMGPRTCLS^Skeletal")), "1");
++                      e.addValue(e, ZCTX(_("DMGPRTCLS^All")), "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
 -              me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
 -              me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
 +      me.TR(me);
 +              me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
 +              me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
                        setDependent(e, "cl_decals", 1, 1);
        me.TR(me);
                me.TDempty(me, 0.2);