HLTV Changes for a smoother demo watching experience by AdamTadeusz · Pull Request #1845 · NeotokyoRebuild/neo

AdamTadeusz · 2026-03-15T13:49:22Z

Description

Changes

Don't draw target crosshair when roaming in hltv, always draw own crosshair when roaming and cl_observercrosshair is set
Added drone movement to hltv
Added an option to switch to a spectate target when switching to in eye or chase cam view, and..
an option to change to either in eye or chase came view when changing the spectate target and not in one of the two
Fixed most of the new spectator commands
Fixed ghost beacons showing when roaming
Fixed in-eye view offset
Fixed camera fov getting stuck at a low value after spectating a dead player and going into free roam camera mode
SourceTV is now not considered a spectator by neobotmanager (if there are any bots on the server and sourcetv but no players, neobotmanager will start kicking bots if neo_bot_join_after_player is set)
Fixed the neo_fov and other missing convar value error

Things that I'm aware of that still need to be fixed (not in this PR)

player animations being choppy or downright broken when doing a lot of skipping
sometimes when one player shoots other players will light up like they're shooting even if they're not
round end victory music does not play in hltv
hltvcamera can spectate observers, not only spectators (good?) but also dead players (probably bad)

Toolchain

Windows MSVC VS2022

Linked Issues

fixes As a HLTV observer I should not be able to see any crosshair when roaming and cl_observercrosshair is set to 0, and not my targets crosshair if cl_neo_crosshair_network is set to 1 #1844

src/game/shared/neo/neo_gamerules.cpp

src/game/client/game_controls/SpectatorGUI.cpp

src/game/client/neo/ui/neo_hud_round_state.cpp

src/game/client/hltvcamera.cpp

src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp

src/game/shared/neo/neo_gamerules.h

… i only now noticed

AdamTadeusz · 2026-03-17T16:42:27Z

I noticed there were some other issues with the pr as well, namely:

When switching spectate mode to free cam, if my current spectate target (who I am now no longer following) died with cl_neo_hltvcamera_auto_observe_killer_if_observing_victim enabled, I would get moved to spectate the killer anyway. Fixed by adding extra checks for the current m_nCameraMode
I added a nullptr dereference to hud_crosshair
I never called SetLastKiller, instead unintentionally called SetLastAttacker in two places
There were some problems with the weapon viewmodel being very dark sometimes. I guess the workaround for viewmodels going dark when facing a wall breaks when watching a stv replay. I added a check to not do this workaround when watching a stv replay. I also noticed that the weapon world models, while looking better when dropped with a similar workaround, didn't look so good when held by players, so decided to only do that workaround for worldmodels if they aren't attached to anything.

DESTROYGIRL

This introduces a bug where your crosshair remains visible after death in spectate. I have a demo of it happening if you would like

AdamTadeusz · 2026-03-18T19:46:32Z

This introduces a bug where your crosshair remains visible after death in spectate. I have a demo of it happening if you would like

is this with cl_observercrosshair 1 ?

DESTROYGIRL · 2026-03-18T19:48:16Z

This introduces a bug that makes my iq lower

…rosshair

DESTROYGIRL

a nit

src/game/client/c_baseanimating.cpp

src/game/shared/neo/neo_gamerules.cpp

Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com>

…#1845) * init * cl_observercrosshair is only for roaming observer crosshair * makes most of the new spectate commands work in hltv * fix beacons too * view offsets, userid to entindex properly * neobotmanager ignore sourcetv, fix rest spectate commands * crosshair assert when spectating dead players * float, call spectateChecks function * gpGlobals->maxClients * nits plus quick fixes plus viewmodel is really dark in stvdemos which i only now noticed * don't move lighting origin of weapons attached to players * should probably define this string somewhere else at this point * revert changes to hud_crosshair trying to be smart about cl_observercrosshair * Update src/game/shared/neo/neo_gamerules.cpp Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com> --------- Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com>

* Fix demoui smoother buttons being unreactive (#1842) * Fix demoui smoother buttons being unreactive * Fix wrong budget group * Refactor Improve code readability * Server side second auto record command (#1855) * working * fix * delay game_end to end of round * not every comp game should necessarily be recorded * rainfix * Fix spec_next/prev not skipping dead players (#1856) Fix a case where in server demos, spec_next/spec_prev does not correctly skip dead players. * DebugDrawLine grenade trails for spectators and practicing (#1852) * working using debugdralines * clamp and float and stuff * Fix env_sun being hidden when under the centre of view (#1839) * Changing cl_neo_squad_hud_avatar_size updates star texture sizes immediately, also cl_neo_hud_centre convars (#1829) * init * also solve the woldpos marker centre sizes not updating automatically * le epic linux fail * maybe inline breaking it * center -> centre, GetFloat, f * HLTV Changes for a smoother demo watching experience (#1845) * init * cl_observercrosshair is only for roaming observer crosshair * makes most of the new spectate commands work in hltv * fix beacons too * view offsets, userid to entindex properly * neobotmanager ignore sourcetv, fix rest spectate commands * crosshair assert when spectating dead players * float, call spectateChecks function * gpGlobals->maxClients * nits plus quick fixes plus viewmodel is really dark in stvdemos which i only now noticed * don't move lighting origin of weapons attached to players * should probably define this string somewhere else at this point * revert changes to hud_crosshair trying to be smart about cl_observercrosshair * Update src/game/shared/neo/neo_gamerules.cpp Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com> --------- Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com> --------- Co-authored-by: Rainyan <Rainyan@users.noreply.github.com> Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com>

AdamTadeusz added 2 commits March 15, 2026 13:05

init

31ef456

cl_observercrosshair is only for roaming observer crosshair

382a719

AdamTadeusz added 2 commits March 15, 2026 17:11

makes most of the new spectate commands work in hltv

35ce290

fix beacons too

c9394ac

AdamTadeusz changed the title ~~Don't draw target crosshair when roaming in hltv, always draw own crosshair when roaming and cl_observercrosshair is set, add drone movement to hltv~~ HLTV Changes for a smoother demo watching experience Mar 15, 2026

AdamTadeusz added 3 commits March 16, 2026 10:26

view offsets, userid to entindex properly

842090c

neobotmanager ignore sourcetv, fix rest spectate commands

7d27968

crosshair assert when spectating dead players

911d342

AdamTadeusz requested a review from a team March 16, 2026 15:01

sunzenshen reviewed Mar 17, 2026

View reviewed changes

src/game/shared/neo/neo_gamerules.cpp Outdated Show resolved Hide resolved

src/game/client/game_controls/SpectatorGUI.cpp Outdated Show resolved Hide resolved

sunzenshen requested a review from a team March 17, 2026 04:18

float, call spectateChecks function

e0b66f9

AdamTadeusz added Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament labels Mar 17, 2026

AdamTadeusz mentioned this pull request Mar 17, 2026

344 server side second auto record command #1855

Merged

gpGlobals->maxClients

c2561bb

Rainyan requested changes Mar 17, 2026

View reviewed changes

AdamTadeusz added 3 commits March 17, 2026 16:23

nits plus quick fixes plus viewmodel is really dark in stvdemos which…

5807c3d

… i only now noticed

don't move lighting origin of weapons attached to players

235f84f

should probably define this string somewhere else at this point

952ba36

AdamTadeusz requested review from Rainyan and sunzenshen March 17, 2026 17:40

Rainyan previously approved these changes Mar 17, 2026

View reviewed changes

DESTROYGIRL requested changes Mar 18, 2026

View reviewed changes

revert changes to hud_crosshair trying to be smart about cl_observerc…

a1e45c8

…rosshair

AdamTadeusz dismissed Rainyan’s stale review via a1e45c8 March 18, 2026 20:34

AdamTadeusz requested a review from DESTROYGIRL March 18, 2026 20:42

DESTROYGIRL previously approved these changes Mar 18, 2026

View reviewed changes

src/game/client/c_baseanimating.cpp Show resolved Hide resolved

src/game/shared/neo/neo_gamerules.cpp Outdated Show resolved Hide resolved

Update src/game/shared/neo/neo_gamerules.cpp

48c50b2

Co-authored-by: DESTROYGIRL <toddlodyte44@outlook.com>

AdamTadeusz dismissed DESTROYGIRL’s stale review via 48c50b2 March 18, 2026 21:15

AdamTadeusz requested a review from DESTROYGIRL March 18, 2026 21:15

DESTROYGIRL approved these changes Mar 18, 2026

View reviewed changes

DESTROYGIRL requested a review from a team March 18, 2026 21:20

sunzenshen approved these changes Mar 19, 2026

View reviewed changes

AdamTadeusz merged commit 6d57318 into NeotokyoRebuild:master Mar 19, 2026
7 checks passed

AdamTadeusz deleted the 343_fixDrawingCrosshairInHLTVAndDroneControlsInHLTV branch March 19, 2026 08:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HLTV Changes for a smoother demo watching experience#1845

HLTV Changes for a smoother demo watching experience#1845
AdamTadeusz merged 14 commits intoNeotokyoRebuild:masterfrom
AdamTadeusz:343_fixDrawingCrosshairInHLTVAndDroneControlsInHLTV

AdamTadeusz commented Mar 15, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AdamTadeusz commented Mar 17, 2026

Uh oh!

DESTROYGIRL left a comment •

edited

Loading

Uh oh!

AdamTadeusz commented Mar 18, 2026

Uh oh!

DESTROYGIRL commented Mar 18, 2026

Uh oh!

DESTROYGIRL left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

AdamTadeusz commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Toolchain

Linked Issues

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AdamTadeusz commented Mar 17, 2026

Uh oh!

DESTROYGIRL left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AdamTadeusz commented Mar 18, 2026

Uh oh!

DESTROYGIRL commented Mar 18, 2026

Uh oh!

DESTROYGIRL left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AdamTadeusz commented Mar 15, 2026 •

edited

Loading

DESTROYGIRL left a comment •

edited

Loading