Skip to content

Spectator xray toggled off on spawn, fixes to how outline is drawn#738

Merged
AdamTadeusz merged 8 commits into
NeotokyoRebuild:masterfrom
AdamTadeusz:078_permanentSpectatorXrayFix
Oct 22, 2024
Merged

Spectator xray toggled off on spawn, fixes to how outline is drawn#738
AdamTadeusz merged 8 commits into
NeotokyoRebuild:masterfrom
AdamTadeusz:078_permanentSpectatorXrayFix

Conversation

@AdamTadeusz

Copy link
Copy Markdown
Contributor

Description

Re-overrides the material used to draw player glow for every new player drawn, disabled enabling of xray when dead spectating teammates, moves the toggle off of xray vision when changing teams to clientmodeshared

Toolchain

  • Windows MSVC VS2022
  • Linux GCC Distro Native [Specify distro + GCC version]
  • Linux GCC 10 Sniper 3.0

Linked Issues

@AdamTadeusz

Copy link
Copy Markdown
Contributor Author

player weapons still aren't outlined when players are cloaked, overriding the material before each attachment is drawn seems to not fix it, don't want to really mess with the base DrawModel functions

@AdamTadeusz AdamTadeusz added this to the v9.1-prealpha milestone Oct 16, 2024

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

Apologies about the similar note spam, GitHub gets janky when trying to annotate code across wide ranges for the review.

Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
Comment thread mp/src/game/client/neo/c_neo_player.cpp Outdated
Comment thread mp/src/game/client/neo/c_neo_player.cpp
Comment thread mp/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp Outdated
Comment thread mp/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp Outdated
Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
Comment thread mp/src/game/client/c_basecombatcharacter.cpp Outdated
Comment thread mp/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp Outdated
Comment thread mp/src/game/client/neo/c_neo_player.cpp
@AdamTadeusz
AdamTadeusz requested a review from Rainyan October 17, 2024 09:20
@AdamTadeusz

Copy link
Copy Markdown
Contributor Author

@Rainyan Ok ill stop adding stuff now, the filled in thinner spectator outline can go in a separate pr. It needs a neoAssets pr anyway

brysondev
brysondev previously approved these changes Oct 17, 2024

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

🙈

@AdamTadeusz AdamTadeusz changed the title Spectator xray can't be toggled on by non-spectators, move toggle off of xray mode, fixes to how outline is drawn Spectator xray toggled off on spawn, fixes to how outline is drawn Oct 17, 2024
Rainyan
Rainyan previously approved these changes Oct 22, 2024
Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
Comment thread mp/src/game/client/clientmode_shared.cpp Outdated
@AdamTadeusz
AdamTadeusz dismissed stale reviews from Rainyan and brysondev via 1ac5bb2 October 22, 2024 14:50
@AdamTadeusz
AdamTadeusz requested a review from Rainyan October 22, 2024 15:17
@AdamTadeusz
AdamTadeusz merged commit d24219d into NeotokyoRebuild:master Oct 22, 2024
@AdamTadeusz
AdamTadeusz deleted the 078_permanentSpectatorXrayFix branch January 24, 2025 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Spectator xray can be enabled when dead on a player team, not toggled off when switching away from spectator team or spawning in

3 participants