Skip to content

Backport DM's fixes + spawn menu to master - #716

Merged
nullsystem merged 1 commit into
NeotokyoRebuild:masterfrom
nullsystem:GH-712_DMBackportTDM
Oct 13, 2024
Merged

Backport DM's fixes + spawn menu to master#716
nullsystem merged 1 commit into
NeotokyoRebuild:masterfrom
nullsystem:GH-712_DMBackportTDM

Conversation

@nullsystem

Copy link
Copy Markdown
Collaborator

Description

  • Fixes the issue where you do not spawn after being killed by a player
  • Fixes where you cannot switch class while you're allowed to switch weapons
  • Also add a menu on spawning in to easily switch class

Toolchain

  • Linux GCC Distro Native Arch/GCC 14

Linked Issues

@nullsystem nullsystem added this to the v9.1-prealpha milestone Oct 13, 2024
@nullsystem
nullsystem requested a review from a team October 13, 2024 14:50
Comment thread mp/src/game/server/neo/neo_player.cpp Outdated
Comment thread mp/src/game/server/neo/neo_player.cpp
@nullsystem
nullsystem force-pushed the GH-712_DMBackportTDM branch from 3add068 to 9bfa3ea Compare October 13, 2024 15:34
@nullsystem
nullsystem requested review from a team and brysondev October 13, 2024 15:38
brysondev
brysondev previously approved these changes Oct 13, 2024
@nullsystem
nullsystem requested a review from a team October 13, 2024 15:40
Comment thread mp/src/game/server/neo/neo_player.cpp
AdamTadeusz
AdamTadeusz previously approved these changes Oct 13, 2024

@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 guess this is useful if someone doesn't have f1-f3 keys, but it doesn't really look great, I would rather they could just rebind the open class and loadout menu instead

Comment thread mp/src/game/server/neo/neo_player.cpp
@AdamTadeusz

Copy link
Copy Markdown
Contributor

Seriously why aren't we just using the already provided class and loadout change menu

@nullsystem

Copy link
Copy Markdown
Collaborator Author

Seriously why aren't we just using the already provided class and loadout change menu

As in having it popup always during spawning in DM/TDM?

@AdamTadeusz

Copy link
Copy Markdown
Contributor

Seriously why aren't we just using the already provided class and loadout change menu

As in having it popup always during spawning in DM/TDM?

yes exactly

@nullsystem

Copy link
Copy Markdown
Collaborator Author

@AdamTadeusz Anonying if I just want to keep on using my current weapon + class

@AdamTadeusz

Copy link
Copy Markdown
Contributor

I think going straight to the loadout screen wouldn't be that annoying, you could see if you unlocked any new weapons. Theres also a button on the loadout screen to change your class if you want to.

* Fixes the issue where you do not spawn after being killed by a player
* Fixes where you cannot switch class while you're allowed to switch
  weapons
* Also initiate loadout menu on spawning in
* fixes NeotokyoRebuild#712
@nullsystem

Copy link
Copy Markdown
Collaborator Author

Alright, here it is going straight to loadout menu now

@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 this plays great, if there is a want of disabling the selection menu then the old menu could be added, or more likely some checkbox in the redesign perhaps?

@nullsystem

Copy link
Copy Markdown
Collaborator Author

I think this plays great, if there is a want of disabling the selection menu then the old menu could be added, or more likely some checkbox in the redesign perhaps?

Probably, depends on what people asks for basically

@nullsystem
nullsystem merged commit bcc2d97 into NeotokyoRebuild:master Oct 13, 2024
@nullsystem
nullsystem deleted the GH-712_DMBackportTDM branch May 7, 2025 20:34
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.

TDM not auto-respawning on death

3 participants