Merge branch 'Mario/elevator_view_fix' into 'master'

Disable sv_gameplayfix_unstickplayers as it introduces glitchy visuals while riding elevators

Closes #2740

See merge request xonotic/xonotic-data.pk3dir!1071

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 48aa9dd106ca24f744de5e5f66d2307c6550e127..93cf2a4d31cd0f4951d81913191fca1d52d6e6fc 100644 (file)
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -782,15 +782,11 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt)
                        this.angles = this.angles + movedt * this.avelocity;
                        break;
                case MOVETYPE_STEP:
-                       if (GAMEPLAYFIX_UNSTICKPLAYERS(this) == 2)
-                               _Movetype_CheckStuck(this);
                        _Movetype_Physics_Step(this, movedt);
                        break;
                case MOVETYPE_WALK:
                case MOVETYPE_FLY:
                case MOVETYPE_FLY_WORLDONLY:
-                       if (movedt > 0 && GAMEPLAYFIX_UNSTICKPLAYERS(this) == 2)
-                               _Movetype_CheckStuck(this);
                        _Movetype_Physics_Walk(this, movedt);
                        break;
                case MOVETYPE_TOSS:

diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc
index da6d4cfc364fb45f87fee5390b128ce8b51cb80b..babb38ca4f7c02d966f460703af352826ce6c56d 100644 (file)
--- a/qcsrc/common/physics/movetypes/walk.qc
+++ b/qcsrc/common/physics/movetypes/walk.qc
@@ -6,7 +6,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
        if (dt <= 0)
                return;
 
-       if (GAMEPLAYFIX_UNSTICKPLAYERS(this) == 1)
+       if (GAMEPLAYFIX_UNSTICKPLAYERS(this))
                _Movetype_CheckStuck(this);
 
        bool applygravity = (!_Movetype_CheckWater(this) && this.move_movetype == MOVETYPE_WALK && !(this.flags & FL_WATERJUMP));

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 812f3e92d77e128a12775507d011b616bf250a40..53f78cc5ad2d8b3b077441f9f0d8f5291c63a5e0 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -202,7 +202,7 @@ int autocvar_sv_gameplayfix_easierwaterjump = 1;
 int autocvar_sv_gameplayfix_stepdown = 2;
 float autocvar_sv_gameplayfix_stepdown_maxspeed = 0;
 int autocvar_sv_gameplayfix_stepmultipletimes = 1;
-int autocvar_sv_gameplayfix_unstickplayers = 2;
+int autocvar_sv_gameplayfix_unstickplayers = 0;
 int autocvar_sv_gameplayfix_fixedcheckwatertransition = 1;
 int autocvar_sv_gameplayfix_slidemoveprojectiles = 1;
 int autocvar_sv_gameplayfix_grenadebouncedownslopes = 1;

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 5d38818fb3b79f0ff85f96fb13fcc6c7f74f0e52..9c95b7b9c988af49bccdba4317a5241812476635 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -408,7 +408,7 @@ sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1
 sv_gameplayfix_stepdown 2
-sv_gameplayfix_unstickplayers 2
+sv_gameplayfix_unstickplayers 0
 // only available in qc physics
 set sv_gameplayfix_stepdown_maxspeed 0 "maximum speed walking entities can be moving for stepping down to apply - requires sv_qcphysics 1"