r5026 - in trunk/data: . qcsrc/menu/nexuiz

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Nov 9 15:22:12 EST 2008


Author: div0
Date: 2008-11-09 15:22:12 -0500 (Sun, 09 Nov 2008)
New Revision: 5026

Modified:
   trunk/data/high.cfg
   trunk/data/low.cfg
   trunk/data/med.cfg
   trunk/data/normal.cfg
   trunk/data/omg.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
   trunk/data/ultimate.cfg
   trunk/data/ultra.cfg
Log:
applied most of MirceaKitsune's menu changes


Modified: trunk/data/high.cfg
===================================================================
--- trunk/data/high.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/high.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 4
 cl_nogibs 0
 cl_particles_quality 1
 gl_picmip 0

Modified: trunk/data/low.cfg
===================================================================
--- trunk/data/low.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/low.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 2
 cl_nogibs 0
 cl_particles_quality 0.20
 gl_flashblend 1

Modified: trunk/data/med.cfg
===================================================================
--- trunk/data/med.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/med.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 2
 cl_nogibs 0
 cl_particles_quality 0.5
 gl_picmip 2

Modified: trunk/data/normal.cfg
===================================================================
--- trunk/data/normal.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/normal.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 2
 cl_nogibs 0
 cl_particles_quality 0.5
 gl_picmip 1

Modified: trunk/data/omg.cfg
===================================================================
--- trunk/data/omg.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/omg.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
-cl_decals 1
+cl_decals 0
+cl_decals_time 2
 cl_nogibs 0
 cl_particles_quality 0.20
 gl_flashblend 1

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c	2008-11-09 20:22:12 UTC (rev 5026)
@@ -17,11 +17,11 @@
 	me.TR(me);
 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Servers",  makeNexuizServerListTab()));
 			setDependentStringNotEqual(e, "_cl_name", "Player");
+		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Create",  makeNexuizServerCreateTab()));
+			setDependentStringNotEqual(e, "_cl_name", "Player");
 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Player Setup",  makeNexuizPlayerSettingsTab()));
 			if(cvar_string("_cl_name") == "Player")
 				e.onClick(e, e.onClickEntity); // lol animation
-		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Create",  makeNexuizServerCreateTab()));
-			setDependentStringNotEqual(e, "_cl_name", "Player");
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, me.rows - 2, me.columns, mc);

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2008-11-09 20:22:12 UTC (rev 5026)
@@ -82,7 +82,7 @@
 		me.TDempty(me, 0.5);
 
 	me.gotoRC(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Settings:"));
+		me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Match settings:"));
 	me.TR(me);
 		me.sliderTimelimit = makeNexuizSlider(1.0, 60.0, 0.5, "timelimit_override");
 		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, me.sliderTimelimit, "Time limit:"));
@@ -100,23 +100,6 @@
 		me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, me.sliderFraglimit, "Use map specified default"));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "g_antilag", "AntiLag"));
-	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Map voting:"));
-		me.TD(me, 1, 2, e = makeNexuizTextSlider("g_maplist_votable"));
-			e.addValue(e, "No voting", "0");
-			e.addValue(e, "2 choices", "2");
-			e.addValue(e, "3 choices", "3");
-			e.addValue(e, "4 choices", "4");
-			e.addValue(e, "5 choices", "5");
-			e.addValue(e, "6 choices", "6");
-			e.addValue(e, "7 choices", "7");
-			e.configureNexuizTextSliderValues(e);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "sv_vote_simple_majority", "Simple majority wins vcall"));
-	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of players:"));
 		me.TD(me, 1, 2, makeNexuizSlider(1, 32, 1, "menu_maxplayers"));
 	me.TR(me);
@@ -150,6 +133,23 @@
 			setDependent(e, "bot_number", 0, -1);
 	me.TR(me);
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "g_antilag", "AntiLag"));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Map voting:"));
+		me.TD(me, 1, 2, e = makeNexuizTextSlider("g_maplist_votable"));
+			e.addValue(e, "No voting", "0");
+			e.addValue(e, "2 choices", "2");
+			e.addValue(e, "3 choices", "3");
+			e.addValue(e, "4 choices", "4");
+			e.addValue(e, "5 choices", "5");
+			e.addValue(e, "6 choices", "6");
+			e.addValue(e, "7 choices", "7");
+			e.configureNexuizTextSliderValues(e);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "sv_vote_simple_majority", "Simple majority wins vcall"));
+	me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizButton("Mutators...", '0 0 0'));
 			e.onClick = DialogOpenButton_Click;
 			e.onClickEntity = main.mutatorsDialog;

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2008-11-09 20:22:12 UTC (rev 5026)
@@ -78,16 +78,18 @@
 		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1, 1, sl, "Zoom speed:"));
 		me.TD(me, 1, 2, sl);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
+		sl = makeNexuizSlider(0.45, 0.75, 0.05, "cl_bobcycle");
+		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "View bobbing:"));
+		me.TD(me, 1, 2, sl);
+
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizButton("Weapon order...", '0 0 0'));
+		me.TD(me, 1, 1, e = makeNexuizButton("Weapon settings...", '0 0 0'));
 			e.onClick = DialogOpenButton_Click;
 			e.onClickEntity = main.weaponsDialog;
 		me.TD(me, 1, 2, e0 = makeNexuizTextLabel(0, string_null));
 			e0.textEntity = main.weaponsDialog;
 			e0.allowCut = 1;
 	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair:"));
 		n = 12;
 		for(i = 1; i <= n; ++i)

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2008-11-09 20:22:12 UTC (rev 5026)
@@ -3,10 +3,10 @@
 	METHOD(NexuizWeaponsDialog, toString, string(entity))
 	METHOD(NexuizWeaponsDialog, fill, void(entity))
 	METHOD(NexuizWeaponsDialog, showNotify, void(entity))
-	ATTRIB(NexuizWeaponsDialog, title, string, "Weapon order")
+	ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings")
 	ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-	ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.3)
-	ATTRIB(NexuizWeaponsDialog, rows, float, 9.5)
+	ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35)
+	ATTRIB(NexuizWeaponsDialog, rows, float, 12)
 	ATTRIB(NexuizWeaponsDialog, columns, float, 4)
 	ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(NexuizWeaponsDialog)
@@ -36,9 +36,11 @@
 		me.TD(me, 1, 1, e = makeNexuizButton("Down", '0 0 0'));
 			e.onClick = WeaponsList_MoveDown_Click;
 			e.onClickEntity = me.weaponsList;
-	me.gotoRC(me, me.rows - 2, 0);
+	me.gotoRC(me, me.rows - 3, 0);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_weaponpriority_useforcycling", "Use for weapon cycling"));
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
+	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_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2008-11-09 20:22:12 UTC (rev 5026)
@@ -17,44 +17,7 @@
 	me.configureDialog(me);
 	return me;
 }
-/*
- * cl_decals 1
- * cl_nogibs 0
- * cl_particles_quality 1
- * cl_particles_snow 1
- * r_bloom 1
- * r_coronas 1
- * r_glsl_deluxemapping 1
- * r_glsl_offsetmapping 1
- * r_glsl_offsetmapping_reliefmapping 0
- * r_hdr 0
- * r_shadow_usenormalmap 1
- * r_shadow_gloss 1
- * r_shadow_realtime_dlight 1
- * r_shadow_realtime_dlight_shadows 1
- * r_shadow_realtime_world 1
- * r_shadow_realtime_world_shadows 1
- * r_depthfirst 2
- * r_showsurfaces 0
- * r_water 1
- * r_water_resolutionmultiplier 0.5
- *
- *
- * [X] cl_decals
- * [X] !cl_nogibs
- * Particles: |--v--|
- * [X] Bloom [X] HDR
- * [X] Coronas
- * [X] Deluxemapping [X] Gloss
- * [X] Offsetmapping [X] Reliefmapping
- * [X] dlights [X] normalmaps [X] shadows
- * [X] rtworld [X] shadows
- * [X] depth first world [X] depth first models (?????)
- * [X] OMGLOLWTFBBQ (showsurfaces)
- * [X] water |----------v----|
- *
- *
- */
+
 void fillNexuizEffectsSettingsTab(entity me)
 {
 	entity e;
@@ -101,10 +64,17 @@
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_decals", "Decals"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Decals distance:"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Distance:"));
 		me.TD(me, 1, 2, e = makeNexuizSlider(200, 500, 20, "r_drawdecals_drawdistance"));
 			setDependent(e, "cl_decals", 1, 1);
 	me.TR(me);
+		me.TDempty(me, 0.2);
+	    me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Time:"));
+	    me.TD(me, 1, 2, e = makeNexuizSlider(1, 20, 1, "cl_decals_time"));
+	        setDependent(e, "cl_decals", 1, 1);
+
+	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:"));
 		me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs"));
 			e.addValue(e, "None", "1");
@@ -114,7 +84,6 @@
 			e.configureNexuizTextSliderValues(e);
 
 	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
 	me.TR(me);
 	me.TR(me);
@@ -132,10 +101,10 @@
 			e.addValue(e, "16x", "16");
 			e.configureNexuizTextSliderValues(e);
 	me.TR(me);
-		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
+		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
 			setDependent(e, "r_glsl", 1, 1);
-		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
-			setDependentAND(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 1);
+		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
+			setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
 
 	me.TR(me);
 
@@ -147,24 +116,22 @@
 		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "r_shadow_realtime_dlight", string_null, "Realtime dynamic lighting"));
 		me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_shadow_realtime_dlight_shadows", "Shadows"));
 			setDependent(e, "r_shadow_realtime_dlight", 1, 1);
-
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_shadow_realtime_world", "Realtime world lighting"));
 		me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_shadow_realtime_world_shadows", "Shadows"));
 			setDependent(e, "r_shadow_realtime_world", 1, 1);
-
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));
 			setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);
-	
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
+		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
 			setDependent(e, "r_glsl", 1, 1);
-		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
-			setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
+		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
+			setDependentAND(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 1);
+	
 	me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections"));
 			setDependent(e, "r_glsl", 1, 1);
 		me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
@@ -190,10 +157,4 @@
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "sendcvar cl_nogibs; r_restart", COMMANDBUTTON_APPLY));
 }
-/*
- * [X] depth first world [X] depth first models (?????)
- * [X] OMGLOLWTFBBQ (showsurfaces)
- *
- *
- */
 #endif

Modified: trunk/data/ultimate.cfg
===================================================================
--- trunk/data/ultimate.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/ultimate.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 10
 cl_nogibs 0
 cl_particles_quality 1
 gl_picmip 0

Modified: trunk/data/ultra.cfg
===================================================================
--- trunk/data/ultra.cfg	2008-11-09 18:23:29 UTC (rev 5025)
+++ trunk/data/ultra.cfg	2008-11-09 20:22:12 UTC (rev 5026)
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_time 10
 cl_nogibs 0
 cl_particles_quality 1
 gl_picmip 0




More information about the nexuiz-commits mailing list