[nexuiz-commits] r7487 - in trunk/data: . qcsrc/menu/nexuiz

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Aug 21 09:28:43 EDT 2009


Author: fruitiex
Date: 2009-08-21 09:28:42 -0400 (Fri, 21 Aug 2009)
New Revision: 7487

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
   trunk/data/tooltips.db
Log:
add cl_gunalign to menu, move v_flipped to weapon dialog, add tooltip and fix spacing in defaultNexuiz.cfg


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-08-21 13:04:20 UTC (rev 7486)
+++ trunk/data/defaultNexuiz.cfg	2009-08-21 13:28:42 UTC (rev 7487)
@@ -808,7 +808,7 @@
 seta r_ambient 4
 cl_decals_fadetime 1
 cl_decals_time 2
-seta  cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left"
+seta cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
 seta cl_gibs_damageforcescale 3.5 "force to push around gibs"

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2009-08-21 13:04:20 UTC (rev 7486)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2009-08-21 13:28:42 UTC (rev 7487)
@@ -6,7 +6,7 @@
 	ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings")
 	ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
 	ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35)
-	ATTRIB(NexuizWeaponsDialog, rows, float, 15)
+	ATTRIB(NexuizWeaponsDialog, rows, float, 16)
 	ATTRIB(NexuizWeaponsDialog, columns, float, 4)
 	ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(NexuizWeaponsDialog)
@@ -26,7 +26,7 @@
 	entity e;
 	float h0, h;
 
-	h = me.rows - 6;
+	h = me.rows - 7;
 	
 	me.TR(me);
 		me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon priority list:"));
@@ -46,9 +46,16 @@
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
 	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));
 	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align"));
+			setDependent(e, "r_drawviewmodel", 1, 1);
+		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align"));
+			setDependent(e, "r_drawviewmodel", 1, 1);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Flip view horizontally"));
+	me.TR(me);
 		me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-08-21 13:04:20 UTC (rev 7486)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-08-21 13:28:42 UTC (rev 7487)
@@ -91,10 +91,6 @@
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Intensity:"));
 		me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
-	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode"));
-	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_conwidth $menu_vid_conwidth; vid_conheight $menu_vid_conheight; vid_restart", COMMANDBUTTON_APPLY));

Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db	2009-08-21 13:04:20 UTC (rev 7486)
+++ trunk/data/tooltips.db	2009-08-21 13:28:42 UTC (rev 7487)
@@ -61,6 +61,7 @@
 \cl_weaponpriority_useforcycling\Make use of the list above when cycling through weapons with the mouse wheel
 \cl_autoswitch\Automatically switch to newly picked up weapons if they are better than what you are carrying
 \r_drawviewmodel\Draw the weapon model
+\cl_gunalign\Position of the weapon model; requires reconnect
 
 \crosshair_per_weapon\Set a different crosshair for each weapon, good if you play without weapon models
 \crosshair_color_override\Also set the color of the crosshair depending on the weapon you are currently holding



More information about the nexuiz-commits mailing list