Skip to content

Expand context hint hud element, picking up weapons with use key#1944

Open
AdamTadeusz wants to merge 24 commits into
NeotokyoRebuild:masterfrom
AdamTadeusz:355_allWeaponsCanBePickedUpWithUseKey
Open

Expand context hint hud element, picking up weapons with use key#1944
AdamTadeusz wants to merge 24 commits into
NeotokyoRebuild:masterfrom
AdamTadeusz:355_allWeaponsCanBePickedUpWithUseKey

Conversation

@AdamTadeusz

@AdamTadeusz AdamTadeusz commented Apr 13, 2026

Copy link
Copy Markdown
Contributor

Description

  • Adds contextual hints when the player is hovering over most interactable objects
  • Option to highlight the interactable object
  • Allows weapon pickup with the use key. The weapon in the corresponding slot (if any) will be automatically dropped (currently even if the new weapon cannot be picked up sometimes)
  • On death utility will now drop with one ammo, and a duplicate utility weapon with one ammo will drop for each extra ammo the original weapon had
  • Changes how ghost startup sound is played and stopped to work using the ghost with the use key, shows the uplink state hud element if the ghost is not active but sv_neo_ctg_ghost_beacons_when_inactive is enabled, hides uplink hud element after the round is over (when ghost beacons can no longer be drawn)
  • Requesting bot to drop a weapon or join squad is now done client side

Toolchain

  • Windows MSVC VS2022

Fixes

-fixes #1959
-fixes #1957
-fixes #1942
-fixes #1958

@AdamTadeusz AdamTadeusz marked this pull request as draft April 13, 2026 15:16
}

// We need to run this for its side-effects, even in the IsDead case below... should be refactored.
const bool okRet = BaseClass::BumpWeapon(pWeapon);

@AdamTadeusz AdamTadeusz Apr 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

CHL2MP_Player::BumpWeapon calls Weapon_Equip and generally i figured we should follow the same logic as in CBasePlayer::GiveNamedItem( after the misyl fix down in CNEO_Player::GiveLoadoutWeapon(

@AdamTadeusz AdamTadeusz marked this pull request as ready for review May 4, 2026 13:15
@AdamTadeusz AdamTadeusz requested a review from a team May 4, 2026 13:17
@AdamTadeusz AdamTadeusz changed the title Expand context hint hud element Expand context hint hud element, picking up weapons with use key May 4, 2026
@Rainyan Rainyan self-requested a review June 4, 2026 09:54
Comment thread src/game/client/neo/c_neo_player.cpp Outdated
Comment thread src/game/client/neo/ui/neo_hud_context_hint.cpp
Comment thread src/game/client/neo/ui/neo_hud_context_hint.cpp Outdated
Comment thread src/game/client/neo/ui/neo_hud_context_hint.cpp Outdated
Comment thread src/game/client/neo/ui/neo_hud_context_hint.cpp Outdated
Comment thread src/game/server/neo/neo_player.cpp Outdated
Comment thread src/game/shared/neo/neo_juggernaut.h Outdated
Comment thread src/game/shared/neo/neo_player_shared.cpp
Comment thread src/game/shared/neo/neo_player_shared.cpp Outdated
Comment thread src/game/client/c_buttons.cpp Outdated
@Rainyan Rainyan requested a review from a team June 4, 2026 11:35
@Rainyan Rainyan self-requested a review June 4, 2026 14:29
Rainyan
Rainyan previously approved these changes Jun 4, 2026

@Rainyan Rainyan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@Rainyan Rainyan requested a review from a team June 4, 2026 14:55
@sunzenshen sunzenshen added the Conflict conflicts with master label Jun 12, 2026
@sunzenshen sunzenshen self-requested a review June 12, 2026 02:01
Masterkatze
Masterkatze previously approved these changes Jun 12, 2026

@Masterkatze Masterkatze 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.

LGTM. Rebased on master and tested locally.

@sunzenshen sunzenshen removed their request for review June 12, 2026 20:50
@AdamTadeusz AdamTadeusz dismissed stale reviews from Masterkatze and Rainyan via 51c7395 June 17, 2026 08:52
@AdamTadeusz AdamTadeusz removed the Conflict conflicts with master label Jun 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants