Skip to content

Add medium (new default) option to extended killfeed #1750

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
Agiel merged 1 commit into from
Feb 27, 2026
Merged

Add medium (new default) option to extended killfeed #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/game/client/neo/ui/neo_hud_deathnotice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ void CNEOHud_DeathNotice::RetireExpiredDeathNotices( void )
//-----------------------------------------------------------------------------
// Purpose: Server's told us that someone's died
//-----------------------------------------------------------------------------
ConVar cl_neo_hud_extended_killfeed("cl_neo_hud_extended_killfeed", "1", FCVAR_ARCHIVE, "Show extra events in killfeed", true, 0, true, 1);
ConVar cl_neo_hud_extended_killfeed("cl_neo_hud_extended_killfeed", "1", FCVAR_ARCHIVE, "Show extra events in killfeed. 1 = Objectives, 2 = Objectives and rank-ups", true, 0, true, 2);
void CNEOHud_DeathNotice::FireGameEvent(IGameEvent* event)
{
if (!g_PR)
Expand All @@ -722,14 +722,10 @@ void CNEOHud_DeathNotice::FireGameEvent(IGameEvent* event)
{
AddPlayerDeath(event);
}
else if (!cl_neo_hud_extended_killfeed.GetBool())
else if (cl_neo_hud_extended_killfeed.GetInt() < 1)
{
return;
}
else if (!Q_stricmp(eventName, "player_rankchange"))
{
AddPlayerRankChange(event);
}
else if (!Q_stricmp(eventName, "ghost_capture"))
{
AddPlayerGhostCapture(event);
Expand All @@ -742,6 +738,14 @@ void CNEOHud_DeathNotice::FireGameEvent(IGameEvent* event)
{
AddVIPDeath(event);
}
else if (cl_neo_hud_extended_killfeed.GetInt() < 2)
{
return;
}
else if (!Q_stricmp(eventName, "player_rankchange"))
{
AddPlayerRankChange(event);
}

}

Expand Down
12 changes: 9 additions & 3 deletions src/game/client/neo/ui/neo_root_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ void NeoSettingsRestore(NeoSettings *ns, const NeoSettings::Keys::Flags flagsKey
pHUD->bShowPos = cvr->cl_showpos.GetBool();
pHUD->iShowFps = cvr->cl_showfps.GetInt();
pHUD->bEnableRangeFinder = cvr->cl_neo_hud_rangefinder_enabled.GetBool();
pHUD->bExtendedKillfeed = cvr->cl_neo_hud_extended_killfeed.GetBool();
pHUD->iExtendedKillfeed = cvr->cl_neo_hud_extended_killfeed.GetInt();
pHUD->iKdinfoToggletype = cvr->cl_neo_kdinfo_toggletype.GetInt();
pHUD->bShowHudContextHints = cvr->cl_neo_hud_context_hint_enabled.GetBool();

Expand Down Expand Up @@ -889,7 +889,7 @@ void NeoSettingsSave(const NeoSettings *ns)
cvr->cl_showpos.SetValue(pHUD->bShowPos);
cvr->cl_showfps.SetValue(pHUD->iShowFps);
cvr->cl_neo_hud_rangefinder_enabled.SetValue(pHUD->bEnableRangeFinder);
cvr->cl_neo_hud_extended_killfeed.SetValue(pHUD->bExtendedKillfeed);
cvr->cl_neo_hud_extended_killfeed.SetValue(pHUD->iExtendedKillfeed);
cvr->cl_neo_kdinfo_toggletype.SetValue(pHUD->iKdinfoToggletype);
cvr->cl_neo_hud_context_hint_enabled.SetValue(pHUD->bShowHudContextHints);

Expand Down Expand Up @@ -1430,6 +1430,12 @@ static const wchar_t *IFF_LABELS[] = {
#endif // GLOWS_ENABLE
};

static const wchar_t *EXT_KILLFEED_LABELS[] = {
L"Disabled",
L"Objectives",
L"Objectives & rank-ups"
};

void NeoSettings_HUD(NeoSettings *ns)
{
NeoSettings::HUD *pHud = &ns->hud;
Expand All @@ -1442,7 +1448,7 @@ void NeoSettings_HUD(NeoSettings *ns)
NeoUI::RingBoxBool(L"Show position", &pHud->bShowPos);
NeoUI::RingBox(L"Show FPS", SHOWFPS_LABELS, ARRAYSIZE(SHOWFPS_LABELS), &pHud->iShowFps);
NeoUI::RingBoxBool(L"Show rangefinder", &pHud->bEnableRangeFinder);
NeoUI::RingBoxBool(L"Extended Killfeed", &pHud->bExtendedKillfeed);
NeoUI::RingBox(L"Extended killfeed", EXT_KILLFEED_LABELS, ARRAYSIZE(EXT_KILLFEED_LABELS), &pHud->iExtendedKillfeed);
NeoUI::RingBox(L"Killer damage info auto show", KDMGINFO_TOGGLETYPE_LABELS, KDMGINFO_TOGGLETYPE__TOTAL, &pHud->iKdinfoToggletype);

#ifdef GLOWS_ENABLE
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/neo/ui/neo_root_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ struct NeoSettings
bool bShowPos;
int iShowFps;
bool bEnableRangeFinder;
bool bExtendedKillfeed;
int iExtendedKillfeed;
bool bShowHudContextHints;
int iKdinfoToggletype;

Expand Down