From: Rudolf Polzer Date: Thu, 4 Aug 2011 09:31:07 +0000 (+0200) Subject: add cl_decals_models to effects configs (only in ultra and ultimate) and to the menu X-Git-Tag: xonotic-v0.5.0~148^2~31^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=708976a974ecbc3e5dbc646e6e5063a7e700080a;p=xonotic%2Fxonotic-data.pk3dir.git add cl_decals_models to effects configs (only in ultra and ultimate) and to the menu --- diff --git a/effects-high.cfg b/effects-high.cfg index 664fca7ad..48d0d43b8 100644 --- a/effects-high.cfg +++ b/effects-high.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 4 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-low.cfg b/effects-low.cfg index 769ca5121..9609a5780 100644 --- a/effects-low.cfg +++ b/effects-low.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 0.4 gl_flashblend 1 diff --git a/effects-med.cfg b/effects-med.cfg index a6e5e7d0b..94a85e509 100644 --- a/effects-med.cfg +++ b/effects-med.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-normal.cfg b/effects-normal.cfg index dbad23826..7822102ba 100644 --- a/effects-normal.cfg +++ b/effects-normal.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-omg.cfg b/effects-omg.cfg index 6e6a1dcbb..a68a15787 100644 --- a/effects-omg.cfg +++ b/effects-omg.cfg @@ -1,4 +1,5 @@ cl_decals 0 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 0.4 gl_flashblend 1 diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg index d6e501892..20cd2e563 100644 --- a/effects-ultimate.cfg +++ b/effects-ultimate.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 1 cl_decals_time 10 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-ultra.cfg b/effects-ultra.cfg index 47949e551..94d47fab2 100644 --- a/effects-ultra.cfg +++ b/effects-ultra.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 1 cl_decals_time 10 cl_particles_quality 1 gl_flashblend 0 diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 2aa2d5239..23cb6a3b9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -114,7 +114,9 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 1.9, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance")); me.TR(me); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_decals", _("Decals"))); + 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"))); + setDependent(e, "cl_decals", 1, 1); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Distance:")));