Skip to content

Upstream update #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taysta merged 2 commits into from
Dec 12, 2025
Merged

Upstream update #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6088239
no nocartwheelz in racemode?
videoP Nov 28, 2025
3ba7a71
Vulkan: Skip mirror views with r_fastsky enabled #52
JKSunny Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codemp/game/bg_saber.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codemp/rd-vulkan/tr_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down