Merge pull request #284 from taysta/upstream

Upstream update

Author: taysta

codemp/game/bg_saber.c

@@ -2450,12 +2450,12 @@ saberMoveName_t PM_SaberAttackForMovement(saberMoveName_t curmove)
 				}
 			}
 
-			if (client && client->pers.noCartwheel) {
+			if (client && client->pers.noCartwheel && !pm->ps->stats[STAT_RACEMODE]) {
 				allowCartwheels = qfalse;
 			}
 		}
 #else
-		if (cgs.serverMod == SVMOD_JAPRO && (cp_pluginDisable.integer & JAPRO_PLUGIN_NOCART)) {
+		if (cgs.serverMod == SVMOD_JAPRO && (cp_pluginDisable.integer & JAPRO_PLUGIN_NOCART) && !pm->ps->stats[STAT_RACEMODE]) {
 			allowCartwheels = qfalse;
 		}
 #endif

codemp/rd-vulkan/tr_main.cpp

@@ -1054,7 +1054,7 @@ static qboolean R_MirrorViewBySurface( const drawSurf_t *drawSurf, int entityNum
 		return qfalse;
 	}
 
-	if (r_noportals->integer > 1 /*|| (r_fastsky->integer == 1)*/) {
+	if (r_noportals->integer > 1 || (r_fastsky->integer == 1)) {
 		return qfalse;
 	}