[nexuiz-commits] r8625 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Feb 7 10:44:21 EST 2010
Author: fruitiex
Date: 2010-02-07 10:44:21 -0500 (Sun, 07 Feb 2010)
New Revision: 8625
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/physics10.cfg
trunk/data/physics11.cfg
trunk/data/physics151.cfg
trunk/data/physics151b.cfg
trunk/data/physics16rc1.cfg
trunk/data/physics20.cfg
trunk/data/physics25.cfg
trunk/data/physics26.cfg
trunk/data/physicsCPMA.cfg
trunk/data/physicsHavoc.cfg
trunk/data/physicsLzd.cfg
trunk/data/physicsNexrun.cfg
trunk/data/physicsNexrun_old.cfg
trunk/data/physicsNoQWBunny.cfg
trunk/data/physicsQ.cfg
trunk/data/physicsQ2.cfg
trunk/data/physicsQ2a.cfg
trunk/data/physicsQ3.cfg
trunk/data/physicsQBF.cfg
trunk/data/physicsQBFplus.cfg
trunk/data/physicsSamual.cfg
trunk/data/physicsWarsow.cfg
trunk/data/physicsWarsowClassicBunny.cfg
trunk/data/physicsWarsowDev.cfg
trunk/data/qcsrc/server/cl_physics.qc
Log:
more doublejump improvements
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/defaultNexuiz.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -330,7 +330,8 @@
set sv_pogostick 1 "don't require releasing the space bar for jumping again"
set sv_doublejump 0 "allow Quake 2-style double jumps"
-set sv_doublejump_speedcap 0 "wont perform a doublejump if z-axis speed is higher than this, 0 = disable check"
+set sv_jumpspeedcap_min "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this"
+set sv_jumpspeedcap_max "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this"
seta sv_precacheplayermodels 1
seta sv_precacheweapons 0
Modified: trunk/data/physics10.cfg
===================================================================
--- trunk/data/physics10.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics10.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -24,4 +24,5 @@
sv_friction_on_land 0.5
sv_doublejump 0
// 1.0 did not allow re-jumping due to a bug, this is quite close to it
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics11.cfg
===================================================================
--- trunk/data/physics11.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics11.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0.25
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics151.cfg
===================================================================
--- trunk/data/physics151.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics151.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics151b.cfg
===================================================================
--- trunk/data/physics151b.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics151b.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics16rc1.cfg
===================================================================
--- trunk/data/physics16rc1.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics16rc1.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0.2
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics20.cfg
===================================================================
--- trunk/data/physics20.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics20.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics25.cfg
===================================================================
--- trunk/data/physics25.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics25.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physics26.cfg
===================================================================
--- trunk/data/physics26.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physics26.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsCPMA.cfg
===================================================================
--- trunk/data/physicsCPMA.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsCPMA.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsHavoc.cfg
===================================================================
--- trunk/data/physicsHavoc.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsHavoc.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsLzd.cfg
===================================================================
--- trunk/data/physicsLzd.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsLzd.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -24,4 +24,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsNexrun.cfg
===================================================================
--- trunk/data/physicsNexrun.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsNexrun.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -27,4 +27,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
-sv_doublejump_speedcap 270
+sv_jumpspeedcap_min 0
+sv_jumpspeedcap_max 1
Modified: trunk/data/physicsNexrun_old.cfg
===================================================================
--- trunk/data/physicsNexrun_old.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsNexrun_old.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -27,4 +27,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
-sv_doublejump_speedcap 270
+sv_jumpspeedcap_min 0
+sv_jumpspeedcap_max 1
Modified: trunk/data/physicsNoQWBunny.cfg
===================================================================
--- trunk/data/physicsNoQWBunny.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsNoQWBunny.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQ.cfg
===================================================================
--- trunk/data/physicsQ.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQ.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -24,4 +24,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQ2.cfg
===================================================================
--- trunk/data/physicsQ2.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQ2.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQ2a.cfg
===================================================================
--- trunk/data/physicsQ2a.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQ2a.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -24,4 +24,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQ3.cfg
===================================================================
--- trunk/data/physicsQ3.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQ3.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQBF.cfg
===================================================================
--- trunk/data/physicsQBF.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQBF.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsQBFplus.cfg
===================================================================
--- trunk/data/physicsQBFplus.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsQBFplus.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsSamual.cfg
===================================================================
--- trunk/data/physicsSamual.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsSamual.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -22,4 +22,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsWarsow.cfg
===================================================================
--- trunk/data/physicsWarsow.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsWarsow.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsWarsowClassicBunny.cfg
===================================================================
--- trunk/data/physicsWarsowClassicBunny.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsWarsowClassicBunny.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/physicsWarsowDev.cfg
===================================================================
--- trunk/data/physicsWarsowDev.cfg 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/physicsWarsowDev.cfg 2010-02-07 15:44:21 UTC (rev 8625)
@@ -23,4 +23,5 @@
sv_warsowbunny_backtosideratio 0.9
sv_friction_on_land 0
sv_doublejump 0
-sv_doublejump_speedcap 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2010-02-07 13:59:42 UTC (rev 8624)
+++ trunk/data/qcsrc/server/cl_physics.qc 2010-02-07 15:44:21 UTC (rev 8625)
@@ -30,6 +30,7 @@
.float spectatorspeed;
.float doublejump_nextjumptime;
+.float wasinair;
/*
=============
@@ -66,7 +67,7 @@
return;
if(sv_doublejump)
- if(time < self.doublejump_nextjumptime)
+ if(time < self.doublejump_nextjumptime || !self.wasinair)
return;
if(g_runematch)
@@ -89,8 +90,10 @@
mjumpheight = mjumpheight * cvar("g_minstagib_speed_jumpheight");
}
- if(self.velocity_z >= cvar("sv_doublejump_speedcap") && cvar("sv_doublejump_speedcap")) // try to "fix" the crazy stair jumps by limiting at which z-axis speeds you can perform a doublejump
- return; // refuse the jump
+ if(cvar_string("sv_jumpspeedcap_min") != "")
+ self.velocity_z = max(cvar("sv_jumpvelocity") * cvar("sv_jumpspeedcap_min"), self.velocity_z);
+ if(cvar_string("sv_jumpspeedcap_max") != "")
+ self.velocity_z = min(cvar("sv_jumpvelocity") * cvar("sv_jumpspeedcap_max"), self.velocity_z);
if(!(self.lastflags & FL_ONGROUND))
{
@@ -852,6 +855,9 @@
else
self.flags |= FL_JUMPRELEASED;
+ if (!self.wasinair)
+ self.wasinair = !(self.flags & FL_ONGROUND);
+
if (self.waterlevel == WATERLEVEL_SWIMMING)
CheckWaterJump ();
}
More information about the nexuiz-commits
mailing list