r2542 - in trunk/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri May 11 08:07:42 EDT 2007


Author: div0
Date: 2007-05-11 08:07:42 -0400 (Fri, 11 May 2007)
New Revision: 2542

Modified:
   trunk/data/default.cfg
   trunk/data/physics15.cfg
   trunk/data/physics151.cfg
   trunk/data/physics151b.cfg
   trunk/data/physics16rc1.cfg
   trunk/data/physicsQ.cfg
   trunk/data/physicsQ3.cfg
   trunk/data/physicsQBF.cfg
   trunk/data/physicsQBFplus.cfg
   trunk/data/physicsQBR.cfg
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/havocbot.qc
Log:
g_balance_jumpvelocity -> sv_jumpheight


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/default.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -138,7 +138,7 @@
 cl_movement_accelerate $sv_accelerate
 cl_movement_edgefriction $edgefriction
 cl_movement_friction $sv_friction
-cl_movement_jumpvelocity $g_balance_jumpheight
+cl_movement_jumpvelocity $sv_jumpvelocity
 cl_movement_maxairspeed $sv_maxairspeed
 cl_movement_maxspeed $sv_maxspeed
 cl_movement_stepheight $sv_stepheight

Modified: trunk/data/physics15.cfg
===================================================================
--- trunk/data/physics15.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physics15.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0.25
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 0

Modified: trunk/data/physics151.cfg
===================================================================
--- trunk/data/physics151.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physics151.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 0

Modified: trunk/data/physics151b.cfg
===================================================================
--- trunk/data/physics151b.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physics151b.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 0

Modified: trunk/data/physics16rc1.cfg
===================================================================
--- trunk/data/physics16rc1.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physics16rc1.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0.2
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 0

Modified: trunk/data/physicsQ.cfg
===================================================================
--- trunk/data/physicsQ.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physicsQ.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 1

Modified: trunk/data/physicsQ3.cfg
===================================================================
--- trunk/data/physicsQ3.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physicsQ3.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -4,9 +4,9 @@
 sv_accelerate 10
 sv_airaccelerate 1
 sv_friction 6
-edgefriction 0
+edgefriction 1
 sv_stepheight 18
-set g_balance_jumpheight 270
+set sv_jumpvelocity 270
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 1

Modified: trunk/data/physicsQBF.cfg
===================================================================
--- trunk/data/physicsQBF.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physicsQBF.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0.8
 set sv_airaccel_qw 1

Modified: trunk/data/physicsQBFplus.cfg
===================================================================
--- trunk/data/physicsQBFplus.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physicsQBFplus.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0.5
 set sv_airaccel_qw 0.93

Modified: trunk/data/physicsQBR.cfg
===================================================================
--- trunk/data/physicsQBR.cfg	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/physicsQBR.cfg	2007-05-11 12:07:42 UTC (rev 2542)
@@ -3,9 +3,9 @@
 sv_accelerate 5.5
 sv_airaccelerate 5.5
 sv_friction 5
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0.3
 set sv_airaccel_qw 0.93

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-05-11 12:07:42 UTC (rev 2542)
@@ -584,7 +584,7 @@
 	stuffcmd(e, strcat("cl_movement_airaccelerate ", ftos(cvar("sv_airaccelerate")), "\n"));
 	stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n"));
 	stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n"));
-	stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("g_balance_jumpheight")), "\n"));
+	stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n"));
 	stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n"));
 	stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n"));
 	stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/qcsrc/server/cl_physics.qc	2007-05-11 12:07:42 UTC (rev 2542)
@@ -25,7 +25,7 @@
 {
 	float mjumpheight;
 
-	mjumpheight = cvar("g_balance_jumpheight");
+	mjumpheight = cvar("sv_jumpvelocity");
 	if (self.waterlevel >= 2)
 	{
 		if (self.watertype == CONTENT_WATER)

Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc	2007-05-11 11:58:54 UTC (rev 2541)
+++ trunk/data/qcsrc/server/havocbot.qc	2007-05-11 12:07:42 UTC (rev 2542)
@@ -205,7 +205,7 @@
 	self.movement_y = dir * v_right;
 	if (self.flags & FL_INWATER) self.movement_z = dir * v_up; else self.movement_z = 0;
 
-	if ((dir * v_up) >= cvar("g_balance_jumpheight")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1;
+	if ((dir * v_up) >= cvar("sv_jumpvelocity")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1;
 	if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill)*0.1,1)) self.button2=TRUE;
 	if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill,10);
 	




More information about the nexuiz-commits mailing list