[nexuiz-commits] r7814 - in trunk/data: . qcsrc/client qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Sep 15 12:13:53 EDT 2009
Author: fruitiex
Date: 2009-09-15 12:13:52 -0400 (Tue, 15 Sep 2009)
New Revision: 7814
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/client/sbar.qc
trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
trunk/data/tooltips.db
Log:
showspeed menu item replaced by cl_showspeed, cl_showacceleration added
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-09-15 14:16:17 UTC (rev 7813)
+++ trunk/data/defaultNexuiz.cfg 2009-09-15 16:13:52 UTC (rev 7814)
@@ -1586,7 +1586,8 @@
seta cl_showpressedkeys 0 "Show which movement keys someone is pressing: 1 for spectating, 2 for always"
seta cl_showpressedkeys_position "0.5 0.8" "1 0 would be upper right corner, 0.5 0.5 the center"
-seta cl_showspeed 0 "show the XY speed of the player, number selects unit (1 = qu/s (no postfix), 2 = qu/s, 3 = m/s, 4 = km/h, 5 = mph, 6 = knots)"
+seta cl_showspeed 0 "show the XY speed of the player"
+seta cl_showspeed_unit 0 "unit selection (0 = qu/s (no postfix), 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)"
seta cl_showspeed_z 0 "include the speed on the Z-axis"
seta cl_showspeed_size 30 "size of the numbers"
seta cl_showspeed_position 0.7 "Y-axis positioning of the numbers"
@@ -1594,7 +1595,7 @@
seta cl_showacceleration 0 "show the XY acceleration of the player"
seta cl_showacceleration_z 0 "include the speed on the Z-axis"
seta cl_showacceleration_size 40 "height of the bar"
-seta cl_showacceleration_scale 10 "X-axis scale of the bar"
+seta cl_showacceleration_scale 5 "X-axis scale of the bar"
seta cl_showacceleration_alpha 0.5 "alpha of the bar"
seta cl_showacceleration_color_custom 0 "0 = dynamic color depending on acceleration, 1 = use custom color"
seta cl_showacceleration_color "1 0 0" "color of the bar, needs cl_showacceleration_color_custom to be 1"
Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc 2009-09-15 14:16:17 UTC (rev 7813)
+++ trunk/data/qcsrc/client/sbar.qc 2009-09-15 16:13:52 UTC (rev 7814)
@@ -1901,30 +1901,30 @@
float pos, conversion_factor;
string speed, unit;
- switch(cvar("cl_showspeed"))
+ switch(cvar("cl_showspeed_unit"))
{
default:
- case 1:
+ case 0:
unit = "";
conversion_factor = 1.0;
break;
- case 2:
+ case 1:
unit = " qu/s";
conversion_factor = 1.0;
break;
- case 3:
+ case 2:
unit = " m/s";
conversion_factor = 0.0254;
break;
- case 4:
+ case 3:
unit = " km/h";
conversion_factor = 0.0254 * 3.6;
break;
- case 5:
+ case 4:
unit = " mph";
conversion_factor = 0.0254 * 3.6 * 0.6213711922;
break;
- case 6:
+ case 5:
unit = " knots";
conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
break;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-09-15 14:16:17 UTC (rev 7813)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-09-15 16:13:52 UTC (rev 7814)
@@ -38,22 +38,31 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showfps", "Show frames per second"));
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Speedmeter:"));
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showspeed", "Speedometer"));
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "0", "Off"));
- setDependent(e, "showtopspeed", 0, 0);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "1", "in/s"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "2", "m/s"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "0", "qu/s (hidden)"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "1", "qu/s"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "2", "m/s"));
+ setDependent(e, "cl_showspeed", 1, 1);
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "3", "km/h"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "4", "mph"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "3", "km/h"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "4", "mph"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "5", "knots"));
+ setDependent(e, "cl_showspeed", 1, 1);
me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showacceleration", "Show accelerometer"));
+ me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8, e = makeNexuizCheckBoxEx(-1, 0, "showtopspeed", "Also show top speed"));
- setDependent(e, "showspeed", 0.5, -0.5);
+ me.TD(me, 1, 2.8/2, e = makeNexuizTextLabel(0, "Accelerometer scale:"));
+ setDependent(e, "cl_showacceleration", 1, 1);
+ me.TD(me, 1, 2.8/2, e = makeNexuizSlider(1, 10, 0.5, "cl_showacceleration_scale"));
+ setDependent(e, "cl_showacceleration", 1, 1);
me.TR(me);
me.TR(me);
me.TDempty(me, 0.5);
Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db 2009-09-15 14:16:17 UTC (rev 7813)
+++ trunk/data/tooltips.db 2009-09-15 16:13:52 UTC (rev 7814)
@@ -190,8 +190,10 @@
\showtime\Show current time of day, useful on screenshots
\showdate\Show current date, useful on screenshots
\showfps\Show your rendered frames per second
-\showspeed\Show your current speed
-\showtopspeed\Show your top speed, kept on the screen for a maximum of 3 seconds
+\cl_showspeed\Show the speed of the player
+\cl_showspeed_unit\Select the unit used by the speedometer. qu/s = in/s
+\cl_showacceleration\Show the acceleration of the player
+\cl_showacceleration_scale\Excaggerate the accelerometer by this scale multiplier
\NexuizSettingsDialog/Advanced settings...\Advanced settings where you can tweak every single variable of the game
\g_friendlyfire\Percentage of damage dealt to teammates
More information about the nexuiz-commits
mailing list