[nexuiz-commits] r8629 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Feb 10 13:04:17 EST 2010
Author: fruitiex
Date: 2010-02-10 13:04:16 -0500 (Wed, 10 Feb 2010)
New Revision: 8629
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:
cvar that disables doublejump code on ramps for exact old rampjump style
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/defaultNexuiz.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -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_disable_on_ramps 0 "disable doublejump code on ramps to preserve the old rampjump style"
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"
Modified: trunk/data/physics10.cfg
===================================================================
--- trunk/data/physics10.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics10.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -26,3 +26,4 @@
// 1.0 did not allow re-jumping due to a bug, this is quite close to it
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics11.cfg
===================================================================
--- trunk/data/physics11.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics11.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics151.cfg
===================================================================
--- trunk/data/physics151.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics151.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics151b.cfg
===================================================================
--- trunk/data/physics151b.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics151b.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics16rc1.cfg
===================================================================
--- trunk/data/physics16rc1.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics16rc1.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics20.cfg
===================================================================
--- trunk/data/physics20.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics20.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics25.cfg
===================================================================
--- trunk/data/physics25.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics25.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physics26.cfg
===================================================================
--- trunk/data/physics26.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physics26.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsCPMA.cfg
===================================================================
--- trunk/data/physicsCPMA.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsCPMA.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsHavoc.cfg
===================================================================
--- trunk/data/physicsHavoc.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsHavoc.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsLzd.cfg
===================================================================
--- trunk/data/physicsLzd.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsLzd.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -26,3 +26,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsNexrun.cfg
===================================================================
--- trunk/data/physicsNexrun.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsNexrun.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -29,3 +29,4 @@
sv_doublejump 1
sv_jumpspeedcap_min 0
sv_jumpspeedcap_max 1
+sv_doublejump_disable_on_ramps 1
Modified: trunk/data/physicsNexrun_old.cfg
===================================================================
--- trunk/data/physicsNexrun_old.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsNexrun_old.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -29,3 +29,4 @@
sv_doublejump 1
sv_jumpspeedcap_min 0
sv_jumpspeedcap_max 1
+sv_doublejump_disable_on_ramps 1
Modified: trunk/data/physicsNoQWBunny.cfg
===================================================================
--- trunk/data/physicsNoQWBunny.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsNoQWBunny.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQ.cfg
===================================================================
--- trunk/data/physicsQ.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQ.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -26,3 +26,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQ2.cfg
===================================================================
--- trunk/data/physicsQ2.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQ2.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 1
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQ2a.cfg
===================================================================
--- trunk/data/physicsQ2a.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQ2a.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -26,3 +26,4 @@
sv_doublejump 1
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQ3.cfg
===================================================================
--- trunk/data/physicsQ3.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQ3.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQBF.cfg
===================================================================
--- trunk/data/physicsQBF.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQBF.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsQBFplus.cfg
===================================================================
--- trunk/data/physicsQBFplus.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsQBFplus.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsSamual.cfg
===================================================================
--- trunk/data/physicsSamual.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsSamual.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -24,3 +24,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsWarsow.cfg
===================================================================
--- trunk/data/physicsWarsow.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsWarsow.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsWarsowClassicBunny.cfg
===================================================================
--- trunk/data/physicsWarsowClassicBunny.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsWarsowClassicBunny.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/physicsWarsowDev.cfg
===================================================================
--- trunk/data/physicsWarsowDev.cfg 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/physicsWarsowDev.cfg 2010-02-10 18:04:16 UTC (rev 8629)
@@ -25,3 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
+sv_doublejump_disable_on_ramps 0
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2010-02-10 16:38:49 UTC (rev 8628)
+++ trunk/data/qcsrc/server/cl_physics.qc 2010-02-10 18:04:16 UTC (rev 8629)
@@ -822,10 +822,16 @@
{
if(sv_doublejump)
{
- self.flags &~= FL_ONGROUND;
tracebox(self.origin + '0 0 0.01', self.mins, self.maxs, self.origin - '0 0 0.01', MOVE_NORMAL, self);
- if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
- self.flags |= FL_ONGROUND;
+ if(trace_fraction < 1 && trace_plane_normal_z < 0.98 && cvar("sv_doublejump_disable_on_ramps")) {
+ // don't do doublejumps on ramps to preserve old nexuiz ramjump style
+ // print("Trace plane normal z: ", ftos(trace_plane_normal_z), ", disabling dj!\n");
+ }
+ else { // perform doublejump
+ self.flags &~= FL_ONGROUND;
+ if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
+ self.flags |= FL_ONGROUND;
+ }
}
if (self.BUTTON_JUMP)
More information about the nexuiz-commits
mailing list