Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Respawn Button from Cosmatic Drift. #7

Merged
merged 4 commits into from
Jun 23, 2024

Conversation

dffdff2423
Copy link

@dffdff2423 dffdff2423 commented May 31, 2024

About the PR

Ports the respawn button from Cosmatic Drift. Most of this code was originally made by Lank.

Why / Balance

I expect this would be reverted when the server is higher pop, but I think it would be nice to not have to stay as a ghost while the server is such low pop. I have seen it where most of the payers are ghosts that would join if they were able to.

Technical details

Cherry-Picks the following commits/PRs from CD:

I ended up manually integrating them because they were created before we started namspacing things on CD.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

A public method on the ghost gui had it's prototype changed, but this is not really a big deal.

Changelog

🆑 Aquif, Whoever this was copy-pasted from.

  • add: The respawn button has been ported from cosmatic drift.

@dffdff2423
Copy link
Author

dffdff2423 commented May 31, 2024

I expect the tests to fail here when you run them until #8 is merged.

@bhenrich
Copy link
Member

bhenrich commented Jun 1, 2024

Going to talk with the team before merging this one.

I opted to manually integrate the patch because this was before we started namespaceing things.

Based on the following cosmatic drift commit by Lank cosmatic-drift-14/cosmatic-drift@1474f05
This fixes a bug with the respawn button where it did not show the
cooldown properly.

Taken from cosmatic-drift-14/cosmatic-drift#135
@dffdff2423
Copy link
Author

That test failure is unrelated to my code. I thought it was just the loadout that was causing issues. I guess I was wrong. Not entirely sure what the issue is, but I did not touch any of the code relating to starting the round.

@VasilisThePikachu
Copy link
Member

I think its a heisentest thats happening upstream as well

Copy link

github-actions bot commented Jun 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Member

@bhenrich bhenrich left a comment

Choose a reason for hiding this comment

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

Please add the CVars mentioned, then we're good to go 👍

Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
@dffdff2423 dffdff2423 requested a review from bhenrich June 23, 2024 17:40
@VasilisThePikachu VasilisThePikachu dismissed bhenrich’s stale review June 23, 2024 18:48

mrrrrp meow~ (review has been satisfied)

@bhenrich
Copy link
Member

awesome!

@VasilisThePikachu VasilisThePikachu merged commit 48ce5a6 into Axolotl-MRP:master Jun 23, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants