Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects

diff --combined effects-high.cfg
index 456061536d6986d9973275bfc62067906a81aa4d,48c8253a3a2146538f1a9dfa6cc388f76b616ba4..a514ce5cb67d9f2eb563ff8d4220d3a510ee61f7
--- 1/effects-high.cfg
--- 2/effects-high.cfg
+++ b/effects-high.cfg
@@@ -1,10 -1,11 +1,11 @@@
  cl_decals 1
  cl_decals_models 0
  cl_decals_fadetime 4
- cl_particles_quality 1
+ cl_particles 1
+ cl_particles_quality 1.0
  cl_damageeffect 1
  cl_spawn_point_particles 1
--cl_playerdetailreduction 4
++cl_playerdetailreduction 4.0
  gl_flashblend 0
  gl_picmip -1
  mod_q3bsp_nolightmaps 0
@@@ -15,7 -16,7 +16,7 @@@ hud_postprocessing_maxbluralpha 0.
  hud_powerup 0
  r_depthfirst 2
  r_drawdecals_drawdistance 500
- r_drawparticles_drawdistance 2000
+ r_drawparticles_drawdistance 1500
  r_glsl_deluxemapping 1
  r_glsl_offsetmapping 0
  r_glsl_offsetmapping_reliefmapping 0

diff --combined effects-low.cfg
index d98ba526d8e4f97f4a441def438be5bad3bc08f8,91459c7b043af9561041d43b3c28b8ce00157815..b7e9a98a3a7a78fa396023d1f3fe615cd4cb4c4a
--- 1/effects-low.cfg
--- 2/effects-low.cfg
+++ b/effects-low.cfg
@@@ -1,6 -1,7 +1,7 @@@
  cl_decals 1
  cl_decals_models 0
 -cl_particles 1
  cl_decals_fadetime 2
++cl_particles 1
  cl_particles_quality 0.4
  cl_damageeffect 0
  cl_spawn_point_particles 0

diff --combined effects-omg.cfg
index 7c39fbbef6335d8467d2747f119c9b96ab4421cd,9e30a5fbd3982813dbb5675e01ad57a8a7e7cc88..9018ee2c94375ba8740fa35f3357f55ff1d3cf15
--- 1/effects-omg.cfg
--- 2/effects-omg.cfg
+++ b/effects-omg.cfg
@@@ -1,6 -1,7 +1,7 @@@
  cl_decals 0
  cl_decals_models 0
 -cl_particles 1
  cl_decals_fadetime 2
++cl_particles 1
  cl_particles_quality 0.4
  cl_damageeffect 0
  cl_spawn_point_particles 0

diff --combined effects-ultra.cfg
index d530f03b8b7ff004af587d317a6d2ae5f0c23b89,6095e189f522ef2ea69083b9781cd365ee8e08ea..5909f3b83dc956b18141d4c0111b251c60080813
--- 1/effects-ultra.cfg
--- 2/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@@ -1,10 -1,11 +1,11 @@@
  cl_decals 1
  cl_decals_models 0
  cl_decals_fadetime 10
- cl_particles_quality 1
- cl_damageeffect 1
+ cl_particles 1
 -cl_particles_quality 1
 -cl_damageeffect 1
++cl_particles_quality 1.0
++cl_damageeffect 2
  cl_spawn_point_particles 1
--cl_playerdetailreduction 2
++cl_playerdetailreduction 0
  gl_flashblend 0
  gl_picmip -1
  mod_q3bsp_nolightmaps 0

diff --combined qcsrc/menu/classes.c
index ee1ce5d31e025d709b9b3f983b3c420f7a0cc429,2cc5f7d81154bbe7ea9e7d803e1ec8f6700b7e8e..46d0c0269e01d8a3532941343457e1cb39fe346b
--- 1/qcsrc/menu/classes.c
--- 2/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@@ -34,11 -34,12 +34,11 @@@
  #include "xonotic/dialog_settings_video.c"
  #include "xonotic/dialog_settings_effects.c"
  #include "xonotic/dialog_settings_audio.c"
 -#include "xonotic/dialog_settings_game.c"
  #include "xonotic/dialog_settings_user.c"
  #include "xonotic/dialog_settings_user_languagewarning.c"
  #include "xonotic/dialog_settings_misc.c"
  #include "xonotic/dialog_multiplayer.c"
 -#include "xonotic/dialog_multiplayer_profile.c"
 +#include "xonotic/dialog_multiplayer_playersetup.c"
  #include "xonotic/tabcontroller.c"
  #include "xonotic/textlabel.c"
  #include "xonotic/slider.c"
@@@ -60,7 -61,6 +60,7 @@@
  #include "xonotic/dialog_quit.c"
  #include "xonotic/dialog_multiplayer_create.c"
  #include "xonotic/dialog_multiplayer_create_mutators.c"
 +#include "xonotic/dialog_multiplayer_create_advanced.c"
  #include "xonotic/dialog_multiplayer_create_mapinfo.c"
  #include "xonotic/gametypelist.c"
  #include "xonotic/maplist.c"
@@@ -80,15 -80,24 +80,15 @@@
  #include "xonotic/dialog_singleplayer_winner.c"
  #include "xonotic/dialog_credits.c"
  #include "xonotic/credits.c"
 -#include "xonotic/dialog_settings_game_crosshair.c"
 -#include "xonotic/dialog_settings_game_hud.c"
 -#include "xonotic/dialog_settings_game_hudconfirm.c"
 -#include "xonotic/dialog_settings_game_model.c"
 -#include "xonotic/dialog_settings_game_messages.c"
 -#include "xonotic/dialog_settings_game_view.c"
 -#include "xonotic/dialog_settings_game_weapons.c"
 +#include "xonotic/dialog_multiplayer_playersetup_crosshair.c"
 +#include "xonotic/dialog_multiplayer_playersetup_hud.c"
 +#include "xonotic/dialog_multiplayer_playersetup_hudconfirm.c"
 +#include "xonotic/dialog_multiplayer_playersetup_model.c"
 +#include "xonotic/dialog_multiplayer_playersetup_view.c"
 +#include "xonotic/dialog_multiplayer_playersetup_weapons.c"
  #include "xonotic/weaponslist.c"
 -#include "xonotic/dialog_multiplayer_media.c"
 -#include "xonotic/dialog_multiplayer_media_demo.c"
 -#include "xonotic/dialog_multiplayer_media_demo_startconfirm.c"
 -#include "xonotic/dialog_multiplayer_media_demo_timeconfirm.c"
 +#include "xonotic/dialog_multiplayer_demo.c"
  #include "xonotic/demolist.c"
 -#include "xonotic/screenshotimage.c"
 -#include "xonotic/dialog_multiplayer_media_screenshot.c"
 -#include "xonotic/dialog_multiplayer_media_screenshot_viewer.c"
 -#include "xonotic/screenshotlist.c"
 -#include "xonotic/statslist.c"
  #include "xonotic/colorpicker.c"
  #include "xonotic/colorpicker_string.c"
  #include "xonotic/cvarlist.c"
@@@ -113,3 -122,5 +113,4 @@@
  #include "xonotic/dialog_hudpanel_centerprint.c"
  #include "xonotic/dialog_hudpanel_buffs.c"
  #include "xonotic/slider_picmip.c"
 -#include "xonotic/slider_sbfadetime.c"
+ #include "xonotic/slider_particles.c"

diff --combined qcsrc/menu/xonotic/dialog_settings_effects.c
index e3b562ee3bb0459385968fa0a99e16f38bd63151,11cad9fa8881efdfe5569a1860a0d3935f25815c..c56d972d9da92eac957a6a3888709eef3a444456
--- 1/qcsrc/menu/xonotic/dialog_settings_effects.c
--- 2/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@@ -3,7 -3,7 +3,7 @@@ CLASS(XonoticEffectsSettingsTab) EXTEND
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
        ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))
        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
 -      ATTRIB(XonoticEffectsSettingsTab, rows, float, 14.5)
 +      ATTRIB(XonoticEffectsSettingsTab, rows, float, 17)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space
  ENDCLASS(XonoticEffectsSettingsTab)
  entity makeXonoticEffectsSettingsTab();
@@@ -47,8 -47,7 +47,7 @@@ void XonoticEffectsSettingsTab_fill(ent
                if(cvar("developer"))
                        me.TD(me, 1, 5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Ultimate")), '0.5 0 0', "exec effects-ultimate.cfg", 0));
  
-       me.TR(me);
-       me.TR(me);
+       me.gotoRC(me, 1.25, 0);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Geometry detail:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("r_subdivisions_tolerance"));
                        e.addValue(e, ZCTX(_("DET^Lowest")), "16");
@@@ -60,7 -59,13 +59,13 @@@
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Player detail:")));
-               me.TD(me, 1, 2, e = makeXonoticSlider(4, 0, -0.1, "cl_playerdetailreduction"));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_playerdetailreduction"));
+                       e.addValue(e, ZCTX(_("PDET^Low")), "4");
+                       e.addValue(e, ZCTX(_("PDET^Medium")), "3");
+                       e.addValue(e, ZCTX(_("PDET^Normal")), "2");
+                       e.addValue(e, ZCTX(_("PDET^Good")), "1");
+                       e.addValue(e, ZCTX(_("PDET^Best")), "0");
+                       e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Texture resolution:")));
                        setDependent(e, "r_showsurfaces", 0, 0);
@@@ -126,23 -131,23 +131,23 @@@
                        setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1);
        me.TR(me);
        me.TR(me);
-               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, e = makeXonoticTextLabel(0, _("Particles distance:")));
-               me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
+               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.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Damage effects:")));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
-                       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.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Distance:")));
+                       setDependent(e, "cl_decals", 1, 1);
+               me.TD(me, 1, 2, e = makeXonoticSlider(200, 500, 20, "r_drawdecals_drawdistance"));
+                       setDependent(e, "cl_decals", 1, 1);
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_spawn_point_particles", _("Particle effects for spawnpoints")));
-               makeMulti(e, "cl_spawn_event_particles");
+               me.TDempty(me, 0.2);
 -          me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
 -              setDependent(e, "cl_decals", 1, 1);
 -          me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_time"));
 -              setDependent(e, "cl_decals", 1, 1);
++              me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
++                      setDependent(e, "cl_decals", 1, 1);
++              me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_fadetime"));
++                      setDependent(e, "cl_decals", 1, 1);
  
-       me.gotoRC(me, 2, 3.2); me.setFirstColumn(me, me.currentColumn);
+       me.gotoRC(me, 1.25, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "r_coronas", "0", _("No dynamic lighting")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "gl_flashblend", string_null, _("Fake corona lighting")));
@@@ -166,7 -171,6 +171,7 @@@
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Fade corona according to visibility")));
                        setDependent(e, "r_coronas", 1, 1);
 +      me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
                me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects")));
@@@ -178,23 -182,29 +183,30 @@@
                if(s.value != e.savedValue)
                        e.savedValue = 0.4; // default
                me.TD(me, 1, 2, s);
 +      me.TR(me);
        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.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_particles", _("Particles")));
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_spawn_point_particles", _("Spawnpoint effects")));
+                       makeMulti(e, "cl_spawn_event_particles");
+                       setDependent(e, "cl_particles", 1, 1);
        me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Quality:")));
+                       setDependent(e, "cl_particles", 1, 1);
+               me.TD(me, 1, 2, e = makeXonoticParticlesSlider());
+                       setDependent(e, "cl_particles", 1, 1);
+               me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Distance:")));
                        setDependent(e, "cl_decals", 1, 1);
                me.TD(me, 1, 2, e = makeXonoticSlider(200, 500, 20, "r_drawdecals_drawdistance"));
                        setDependent(e, "cl_decals", 1, 1);
-       me.TR(me);
+               me.TR(me);
                me.TDempty(me, 0.2);
--          me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
--              setDependent(e, "cl_decals", 1, 1);
--          me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_fadetime"));
--              setDependent(e, "cl_decals", 1, 1);
++              me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
++                      setDependent(e, "cl_decals", 1, 1);
++              me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_fadetime"));
++                      setDependent(e, "cl_decals", 1, 1);
  
        me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));