Skip to content

Option to disable extended killfeed #1113

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
AdamTadeusz merged 2 commits into from
May 1, 2025
Merged

Option to disable extended killfeed #1113

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
e765619
option to disable extended killfeed
AdamTadeusz Apr 30, 2025
799eac6
neo_root setting
AdamTadeusz Apr 30, 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
5 changes: 5 additions & 0 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 @@ -687,6 +687,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_CLIENTDLL, "Show extra events in killfeed", true, 0, true, 1);
void CNEOHud_DeathNotice::FireGameEvent(IGameEvent* event)
{
if (!g_PR)
Expand All @@ -707,6 +708,10 @@ void CNEOHud_DeathNotice::FireGameEvent(IGameEvent* event)
{
AddPlayerDeath(event);
}
else if (!cl_neo_hud_extended_killfeed.GetBool())
{
return;
}
else if (!Q_stricmp(eventName, "player_rankchange"))
{
AddPlayerRankChange(event);
Expand Down
3 changes: 3 additions & 0 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 @@ -263,6 +263,7 @@ void NeoSettingsRestore(NeoSettings *ns, const NeoSettings::Keys::Flags flagsKey
pGeneral->bStreamerMode = cvr->cl_neo_streamermode.GetBool();
pGeneral->bAutoDetectOBS = cvr->cl_neo_streamermode_autodetect_obs.GetBool();
pGeneral->bEnableRangeFinder = cvr->cl_neo_hud_rangefinder_enabled.GetBool();
pGeneral->bExtendedKillfeed = cvr->cl_neo_hud_extended_killfeed.GetBool();
pGeneral->iBackground = cvr->sv_unlockedchapters.GetInt();
NeoUI::ResetTextures();
}
Expand Down Expand Up @@ -478,6 +479,7 @@ void NeoSettingsSave(const NeoSettings *ns)
cvr->cl_neo_streamermode.SetValue(pGeneral->bStreamerMode);
cvr->cl_neo_streamermode_autodetect_obs.SetValue(pGeneral->bAutoDetectOBS);
cvr->cl_neo_hud_rangefinder_enabled.SetValue(pGeneral->bEnableRangeFinder);
cvr->cl_neo_hud_extended_killfeed.SetValue(pGeneral->bExtendedKillfeed);
cvr->sv_unlockedchapters.SetValue(pGeneral->iBackground);
}
{
Expand Down Expand Up @@ -681,6 +683,7 @@ void NeoSettings_General(NeoSettings *ns)
NeoUI::RingBoxBool(L"Show position", &pGeneral->bShowPos);
NeoUI::RingBox(L"Show FPS", SHOWFPS_LABELS, ARRAYSIZE(SHOWFPS_LABELS), &pGeneral->iShowFps);
NeoUI::RingBoxBool(L"Show rangefinder", &pGeneral->bEnableRangeFinder);
NeoUI::RingBoxBool(L"Extended Killfeed", &pGeneral->bExtendedKillfeed);
NeoUI::SliderInt(L"Selected Background", &pGeneral->iBackground, 1, 4); // NEO TODO (Adam) switch to RingBox with values read from ChapterBackgrounds.txt

NeoUI::HeadingLabel(L"STREAMER MODE");
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -46,6 +46,7 @@ struct NeoSettings
bool bStreamerMode;
bool bAutoDetectOBS;
bool bEnableRangeFinder;
bool bExtendedKillfeed;
int iBackground;
};

Expand Down Expand Up @@ -172,6 +173,7 @@ struct NeoSettings
CONVARREF_DEF(cl_neo_lean_viewmodel_only);
CONVARREF_DEF(cl_neo_lean_automatic);
CONVARREF_DEF(cl_neo_squad_hud_original);
CONVARREF_DEF(cl_neo_hud_extended_killfeed);
CONVARREF_DEF(cl_showpos);
CONVARREF_DEF(cl_showfps);
CONVARREF_DEF(hud_fastswitch);
Expand Down