Skip to content

Refactor avatar handling completely for overlay + scoreboard + killer info - #2101

Merged
nullsystem merged 7 commits into
NeotokyoRebuild:masterfrom
nullsystem:OverlayOwnAvatar
Aug 30, 2026
Merged

Refactor avatar handling completely for overlay + scoreboard + killer info#2101
nullsystem merged 7 commits into
NeotokyoRebuild:masterfrom
nullsystem:OverlayOwnAvatar

Conversation

@nullsystem

@nullsystem nullsystem commented Aug 28, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Description

Throw away CAvatarImage and just it ourselves

Testing: Just go through a lot of demos + reloading NT;RE and doing it again to be sure it loads up properly.

Toolchain

  • Linux GCC Distro Native Arch/GCC 16

@nullsystem
nullsystem marked this pull request as draft August 28, 2026 18:18
@DESTROYGIRL DESTROYGIRL added the UI/HUD Relates to the HUD, NeoUI, menus, etc label Aug 28, 2026
@nullsystem
Overlay have its own CAvatarImage instead of pulling from scoreboard
b769331 
Just a minor thing so spectator doesn't have to press tab to get avatar
working for overlay sometimes.
@nullsystem
nullsystem marked this pull request as ready for review August 28, 2026 18:42
@nullsystem nullsystem added the Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament label Aug 28, 2026
Agiel
Agiel previously approved these changes Aug 29, 2026
View reviewed changes
@Agiel
Agiel requested a review from a team August 29, 2026 09:56
@sunmachine sunmachine self-assigned this Aug 29, 2026
@AdamTadeusz

AdamTadeusz commented Aug 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Ideally we would have a separate CAvatarImage storage that is updated as players join and leave, that other elements can reference instead of each requesting their own copy of each player's avatar, but this seems like a fine workaround for now

@AdamTadeusz
AdamTadeusz self-requested a review August 29, 2026 16:26
AdamTadeusz
AdamTadeusz previously approved these changes Aug 29, 2026
View reviewed changes
Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp
@sunmachine

sunmachine commented Aug 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

I am verifying a possible crash case. 😂 I am working slow though; will get it up hopefully soon @nullsystem

Edit: Review is up 👍 two nits, higher-res-monitor issue with icons, and image list fix.

@AdamTadeusz

AdamTadeusz commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

Oh yeah m_pImageList has m_bDeleteImagesWhenDone set to false, when are the new CAvatarImage s deleted?

sunmachine
sunmachine requested changes Aug 29, 2026
View reviewed changes
Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp Outdated
sunmachine
sunmachine previously requested changes Aug 29, 2026
View reviewed changes
Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp Outdated
Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp Outdated
sunmachine
sunmachine reviewed Aug 29, 2026
View reviewed changes

@sunmachine sunmachine left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-blocking nit-picks

Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp Outdated
Comment thread src/game/client/neo/ui/neo_hud_spectator_overlay.cpp Outdated
@nullsystem
nullsystem dismissed stale reviews from AdamTadeusz and Agiel via c2f9699 August 30, 2026 00:49
@nullsystem
nullsystem marked this pull request as draft August 30, 2026 02:09
@nullsystem

nullsystem commented Aug 30, 2026

Copy link
Copy Markdown
Collaborator Author

Going to work on a "NeoAvatar" CAvatarImage replacement and extend this PR to cover redoing scoreboard + killer HUD.

@nullsystem
nullsystem marked this pull request as ready for review August 30, 2026 02:33
@nullsystem
nullsystem marked this pull request as draft August 30, 2026 02:35
@nullsystem
nullsystem marked this pull request as ready for review August 30, 2026 02:37
@nullsystem nullsystem changed the title Overlay have its own CAvatarImage instead of pulling from scoreboard Refactor avatar handling completely for overlay + scoreboard + killer info Aug 30, 2026
@nullsystem
nullsystem marked this pull request as draft August 30, 2026 02:40
@nullsystem
Change to NeoAvatar
5403871 
Throw away using CAvatarImage and instead just have our own simpler
version of it. Applied for overlay, scoreboard, and killer info.
@nullsystem
nullsystem marked this pull request as ready for review August 30, 2026 02:47
@nullsystem nullsystem added the New Changes for Reviewers New changes has been made. This label is mostly to notify reviewers. label Aug 30, 2026
@nullsystem

nullsystem commented Aug 30, 2026

Copy link
Copy Markdown
Collaborator Author

@Agiel @AdamTadeusz @sunmachine Just to note the PR is completely re-written so re-review it fully.

@AdamTadeusz

AdamTadeusz commented Aug 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Ok so I'm watching back a demo from yesterday and in the spectator overlay I can only see the profile pictures of players im friends with on steam (and my own profile picture)
Zrzut ekranu 2026-08-30 144541
I removed you from my friends list, restarted steam and the game, and now your profile picture also doesn't load
Zrzut ekranu 2026-08-30 144906

(Edit) This is on windows

AdamTadeusz
AdamTadeusz reviewed Aug 30, 2026
View reviewed changes
Comment thread src/game/client/neo/ui/neo_avatar.cpp Outdated
@nullsystem
Add RequestUserInformation call
120a77c 
Somehow Windows need it but Linux doesn't? But just one thing that was
glossed over verses vgui avatar version.
@nullsystem
nullsystem requested a review from AdamTadeusz August 30, 2026 14:09
@AdamTadeusz

AdamTadeusz commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

Great!

image

AdamTadeusz
AdamTadeusz previously approved these changes Aug 30, 2026
View reviewed changes

@AdamTadeusz AdamTadeusz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think steamapicontext is deprecated but lgtm

Agiel
Agiel previously approved these changes Aug 30, 2026
View reviewed changes

@Agiel Agiel left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified that it's working on Linux also 🐧

@nullsystem
nullsystem dismissed stale reviews from Agiel and AdamTadeusz via a670556 August 30, 2026 14:31
@nullsystem

nullsystem commented Aug 30, 2026

Copy link
Copy Markdown
Collaborator Author

@AdamTadeusz a670556 removed steamapicontext now, mainly so lines aren't so long/redudent anyway

@sunmachine
sunmachine dismissed their stale review August 30, 2026 15:32

No longer applicable!

@sunmachine sunmachine removed their assignment Aug 30, 2026
@sunmachine

sunmachine commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

@Agiel @AdamTadeusz @sunmachine Just to note the PR is completely re-written so re-review it fully.

🤌 Good shit

@nullsystem
nullsystem merged commit 57a09a8 into NeotokyoRebuild:master Aug 30, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Agiel Agiel Agiel approved these changes
@sunmachine sunmachine sunmachine approved these changes
@AdamTadeusz AdamTadeusz AdamTadeusz approved these changes

Assignees

No one assigned

Labels

New Changes for Reviewers New changes has been made. This label is mostly to notify reviewers. Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament UI/HUD Relates to the HUD, NeoUI, menus, etc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nullsystem @AdamTadeusz @sunmachine @Agiel @DESTROYGIRL