[nexuiz-commits] r7315 - in branches/nexuiz-2.0: . data data/qcsrc/menu/nexuiz

Tue Aug 4 03:10:59 EDT 2009

Author: div0
Date: 2009-08-04 03:10:55 -0400 (Tue, 04 Aug 2009)
New Revision: 7315

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
   branches/nexuiz-2.0/data/tooltips.db
Log:
r7310 | div0 | 2009-08-03 14:40:48 -0400 (Mon, 03 Aug 2009) | 2 lines
MOAR TOOLTIPZ
r7311 | div0 | 2009-08-03 14:44:30 -0400 (Mon, 03 Aug 2009) | 2 lines
what went wrong with committing this fix? Retry committing this... with correct names effects-*.cfg
r7312 | div0 | 2009-08-03 15:15:26 -0400 (Mon, 03 Aug 2009) | 2 lines
set gameversion_min and gameversion_max to restrict compatibility in the future (server browser only)
r7313 | div0 | 2009-08-03 15:25:59 -0400 (Mon, 03 Aug 2009) | 2 lines
comment
r7314 | div0 | 2009-08-03 15:29:21 -0400 (Mon, 03 Aug 2009) | 2 lines
fix typo in tooltip


Modified: branches/nexuiz-2.0/.patchsets
===================================================================

--- branches/nexuiz-2.0/.patchsets	2009-08-03 19:29:21 UTC (rev 7314)
+++ branches/nexuiz-2.0/.patchsets	2009-08-04 07:10:55 UTC (rev 7315)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7308
+revisions_applied = 1-7314

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-08-03 19:29:21 UTC (rev 7314)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-08-04 07:10:55 UTC (rev 7315)
@@ -37,7 +37,23 @@
 //
 // e.g. Nexuiz 1.5.1 RC1 will be 15101
 gameversion 20000
+gameversion_min 20000 // 2.5.2 still used this
+gameversion_max 20699 // 2.5 version allows any 2.6 release, but no more
 
+// compatibility guideline:
+//   version a.b.c   = a0b0c
+//   gameversion_min = a0(b-1)00 // show servers of the previous "line"
+//   gameversion_max = a0(b+1)99 // show servers of the next "line"
+// example: 2.6.3
+//   gameversion 20603
+//   gameversion_min 20500
+//   gameversion_max 20799
+// however, in 2.5.x, we will:
+//   gameversion = 20000 // let other 2.5 clients connect
+//   gameversion_min = 20000 // 2.5.x still has this, we cannot block it within 2.5
+// however, in 2.6.x, we will just:
+//   gameversion_min = 20000 // show 2.5 servers
+
 // say aliases
 alias asay_ctf_flagcarrier "say_team flag carrier at %y"
 alias asay_ctf_haveflag "say_team (%l) have the flag"

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-08-03 19:29:21 UTC (rev 7314)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-08-04 07:10:55 UTC (rev 7315)
@@ -26,13 +26,13 @@
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Quality preset:"));
 		n = 6 + !!cvar("developer");
 		if(cvar("developer"))
-			me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("OMG!", '1 0 1', "exec omg.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Low", '0 0 0', "exec low.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Medium", '0 0 0', "exec med.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Normal", '0 0 0', "exec normal.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("High", '0 0 0', "exec high.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Ultra", '0 0 0', "exec ultra.cfg", 0));
-		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Ultimate", '0 0 0', "exec ultimate.cfg", 0));
+			me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("OMG!", '1 0 1', "exec effects-omg.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Low", '0 0 0', "exec effects-low.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Medium", '0 0 0', "exec effects-med.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Normal", '0 0 0', "exec effects-normal.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("High", '0 0 0', "exec effects-high.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Ultra", '0 0 0', "exec effects-ultra.cfg", 0));
+		me.TD(me, 1, 5.5 / n, e = makeNexuizCommandButton("Ultimate", '0 0 0', "exec effects-ultimate.cfg", 0));
 
 	me.TR(me);
 	me.TR(me);

Modified: branches/nexuiz-2.0/data/tooltips.db
===================================================================
--- branches/nexuiz-2.0/data/tooltips.db	2009-08-03 19:29:21 UTC (rev 7314)
+++ branches/nexuiz-2.0/data/tooltips.db	2009-08-04 07:10:55 UTC (rev 7315)
@@ -151,6 +151,8 @@
 \r_coronas_occlusionquery\Fade coronas according to visibility (default: enabled)
 \r_bloom\Enable bloom effect, which brightens the neighboring pixels of very bright pixels. Has a big impact on performance. (default: disabled)
 \r_hdr\Higher quality version of bloom, which has a huge impact on performance. (default: disabled)
+\r_motionblur\Motion blur strength from 0.0 to 1.0 - 0.7 recommended
+\r_damageblur\Amount of motionblur when hurt - 0.4 recommended
 
 \NexuizSettingsDialog/Audio\Audio settings
 \bgmvolume\-
@@ -198,8 +200,13 @@
 \cl_teamradar_rotation\-
 \cl_teamradar_scale\-
 \cl_teamradar_foreground_alpha\-
-\cl_teamradar_background_alpha\-
-\cl_hidewaypoints\-
-\cl_shownames\-
+\cl_teamradar_background_alpha\Opacity value of the radar background
+\sbar_alpha_bg\Opacity value of the HUD background
+\sbar_color_bg_r\Red color component of the HUD background
+\sbar_color_bg_g\Green color component of the HUD background
+\sbar_color_bg_b\Blue color component of the HUD background
+\sbar_color_bg_team\Team color saturation of the HUD background
+\cl_hidewaypoints\Show various gametype specific waypoints
+\cl_shownames\Show the name of the player you are aiming at
 
 \crosshair_hittest\None: do not do hit tests for the crosshair; TrueAim: blur the crosshair when you would not hit the wall; Enemies: also enlarge the crosshair when you would hit an enemy

