r5455 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-08 13:18:10 -0500 (Thu, 08 Jan 2009)
New Revision: 5455

Modified:
   trunk/data/effectinfo.txt
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
   trunk/data/qcsrc/server/cl_player.qc
Log:
menu rearrangements
item_respawn effect more particles


Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt	2009-01-08 14:46:18 UTC (rev 5454)
+++ trunk/data/effectinfo.txt	2009-01-08 18:18:10 UTC (rev 5455)
@@ -850,7 +850,7 @@
 alpha 128 128 128
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_respawn
-count 64
+count 256
 type spark
 tex 41 41
 color 0x63F2EA 0x63f2EA

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-01-08 14:46:18 UTC (rev 5454)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-01-08 18:18:10 UTC (rev 5455)
@@ -7,7 +7,7 @@
 	ATTRIB(NexuizMutatorsDialog, title, string, "Mutators")
 	ATTRIB(NexuizMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
 	ATTRIB(NexuizMutatorsDialog, intendedWidth, float, 0.8)
-	ATTRIB(NexuizMutatorsDialog, rows, float, 16)
+	ATTRIB(NexuizMutatorsDialog, rows, float, 17)
 	ATTRIB(NexuizMutatorsDialog, columns, float, 6)
 	ATTRIB(NexuizMutatorsDialog, refilterEntity, entity, NULL)
 ENDCLASS(NexuizMutatorsDialog)

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-08 14:46:18 UTC (rev 5454)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-08 18:18:10 UTC (rev 5455)
@@ -127,6 +127,8 @@
 		setDependent(e, "snd_channels", 1.5, 0.5);
 	me.TR(me);
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_taunt_directional", "Play taunts directionally"));
+	me.TR(me);
 		sl = makeNexuizSlider(0.15, 1, 0.05, "cl_autotaunt");
 		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Automatic taunts"));
 		if(sl.value != e.savedValue)
@@ -135,9 +137,7 @@
 		me.TD(me, 1, 3, e = makeNexuizTextLabel(0.1, "Frequency:"));
 		me.TD(me, 1, 2, sl);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_taunt_directional", "Play taunts directionally"));
 	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "cl_hitsound", "Hit indicator"));
 
 	me.gotoRC(me, me.rows - 1, 0);

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-01-08 14:46:18 UTC (rev 5454)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-01-08 18:18:10 UTC (rev 5455)
@@ -91,6 +91,7 @@
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling"));
 	me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode"));
 	me.TR(me);
 

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-01-08 14:46:18 UTC (rev 5454)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-01-08 18:18:10 UTC (rev 5455)
@@ -292,7 +292,7 @@
 	self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
 	self.dmg_inflictor = inflictor;
 
-	if (self.health <= -50)
+	if (self.health <= -75)
 	{
 		// don't use any animations as a gib
 		self.frame = 0;