[nexuiz-commits] r8623 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Feb 7 03:25:50 EST 2010
Author: fruitiex
Date: 2010-02-07 03:25:47 -0500 (Sun, 07 Feb 2010)
New Revision: 8623
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:
add an optional (default off) z-axis speedcap above which a doublejump won't be performed, try values like 270 (=sv_jumpvelocity) to fix crazy jumps off stairs
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/defaultNexuiz.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -330,6 +330,7 @@
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"
seta sv_precacheplayermodels 1
seta sv_precacheweapons 0
Modified: trunk/data/physics10.cfg
===================================================================
--- trunk/data/physics10.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics10.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -24,3 +24,4 @@
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
Modified: trunk/data/physics11.cfg
===================================================================
--- trunk/data/physics11.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics11.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0.25
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics151.cfg
===================================================================
--- trunk/data/physics151.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics151.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics151b.cfg
===================================================================
--- trunk/data/physics151b.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics151b.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics16rc1.cfg
===================================================================
--- trunk/data/physics16rc1.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics16rc1.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0.2
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics20.cfg
===================================================================
--- trunk/data/physics20.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics20.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics25.cfg
===================================================================
--- trunk/data/physics25.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics25.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physics26.cfg
===================================================================
--- trunk/data/physics26.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physics26.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsCPMA.cfg
===================================================================
--- trunk/data/physicsCPMA.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsCPMA.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsHavoc.cfg
===================================================================
--- trunk/data/physicsHavoc.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsHavoc.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsLzd.cfg
===================================================================
--- trunk/data/physicsLzd.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsLzd.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,4 +23,5 @@
sv_warsowbunny_topspeed 925
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
-sv_doublejump 0
\ No newline at end of file
+sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsNexrun.cfg
===================================================================
--- trunk/data/physicsNexrun.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsNexrun.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -27,3 +27,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
+sv_doublejump_speedcap 270
Modified: trunk/data/physicsNexrun_old.cfg
===================================================================
--- trunk/data/physicsNexrun_old.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsNexrun_old.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -27,3 +27,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
+sv_doublejump_speedcap 270
Modified: trunk/data/physicsNoQWBunny.cfg
===================================================================
--- trunk/data/physicsNoQWBunny.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsNoQWBunny.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQ.cfg
===================================================================
--- trunk/data/physicsQ.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQ.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -24,3 +24,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQ2.cfg
===================================================================
--- trunk/data/physicsQ2.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQ2.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQ2a.cfg
===================================================================
--- trunk/data/physicsQ2a.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQ2a.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -24,3 +24,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 1
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQ3.cfg
===================================================================
--- trunk/data/physicsQ3.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQ3.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQBF.cfg
===================================================================
--- trunk/data/physicsQBF.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQBF.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsQBFplus.cfg
===================================================================
--- trunk/data/physicsQBFplus.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsQBFplus.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsSamual.cfg
===================================================================
--- trunk/data/physicsSamual.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsSamual.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -22,3 +22,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsWarsow.cfg
===================================================================
--- trunk/data/physicsWarsow.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsWarsow.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsWarsowClassicBunny.cfg
===================================================================
--- trunk/data/physicsWarsowClassicBunny.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsWarsowClassicBunny.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.8
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/physicsWarsowDev.cfg
===================================================================
--- trunk/data/physicsWarsowDev.cfg 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/physicsWarsowDev.cfg 2010-02-07 08:25:47 UTC (rev 8623)
@@ -23,3 +23,4 @@
sv_warsowbunny_backtosideratio 0.9
sv_friction_on_land 0
sv_doublejump 0
+sv_doublejump_speedcap 0
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2010-02-07 08:08:19 UTC (rev 8622)
+++ trunk/data/qcsrc/server/cl_physics.qc 2010-02-07 08:25:47 UTC (rev 8623)
@@ -100,7 +100,9 @@
self.jumppadcount = 0;
}
- self.velocity_z = self.velocity_z + mjumpheight;
+ 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
+ self.velocity_z = self.velocity_z + mjumpheight;
+
self.oldvelocity_z = self.velocity_z;
self.flags &~= FL_ONGROUND;
More information about the nexuiz-commits
mailing list