From: nyov Date: Wed, 26 Nov 2014 05:40:17 +0000 (+0000) Subject: Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects X-Git-Tag: xonotic-v0.8.0~139^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=498bd21f83049cfcca6e5336cb23c4fdef15ff92;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects --- 498bd21f83049cfcca6e5336cb23c4fdef15ff92 diff --cc effects-high.cfg index 456061536,48c8253a3..a514ce5cb --- a/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 diff --cc effects-low.cfg index d98ba526d,91459c7b0..b7e9a98a3 --- a/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 --cc effects-omg.cfg index 7c39fbbef,9e30a5fbd..9018ee2c9 --- a/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 --cc effects-ultra.cfg index d530f03b8,6095e189f..5909f3b83 --- a/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 --cc qcsrc/menu/classes.c index ee1ce5d31,2cc5f7d81..46d0c0269 --- a/qcsrc/menu/classes.c +++ b/qcsrc/menu/classes.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_particles.c" -#include "xonotic/slider_sbfadetime.c" diff --cc qcsrc/menu/xonotic/dialog_settings_effects.c index e3b562ee3,11cad9fa8..c56d972d9 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@@ -126,23 -131,23 +131,23 @@@ void XonoticEffectsSettingsTab_fill(ent 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"))); @@@ -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));