From: Samual <samual@xonotic.org>
Date: Fri, 20 Jan 2012 02:54:40 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/menu_updates
X-Git-Tag: xonotic-v0.6.0~110
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cd69940bb9c1aa5a98bf0653702b77d730419dde

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

Conflicts:
	qcsrc/menu/xonotic/dialog_settings_effects.c
---

cd69940bb9c1aa5a98bf0653702b77d730419dde
diff --cc effects-high.cfg
index 6d31da3ec4,95fd0f8bd1..65ef997b26
--- a/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 c28654fdb2,e4391c703d..4b0cf62819
--- a/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 91ac6e791a,de41d388cc..e4882b8c00
--- a/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 a488c694fe,490087efdf..64543bcc42
--- a/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 5fb38a2ea3,55a91e4509..902266ca48
--- a/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 63dfc5cb19,8c859f08d9..ec949193cf
--- a/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 359f670818,9dda230cad..48c17c3a31
--- a/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/menu/xonotic/dialog_settings_effects.c
index 2bf13ca941,4e5a9088cb..449d0b6e5b
--- a/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);