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

Gameloop: Split round and time #1710

Merged
merged 6 commits into from
Jan 7, 2025

Conversation

NickCloudAT
Copy link
Contributor

This PR will tackle #1707

Not finished yet, still have to do all LANG files and some testing + cleanup if neccessarry.

Would love some input on this though!

Only "real" problem I have so far is the settings in the F1 menu: I can not "disable" the round time or the round count setting because the "master" is never null but always a value.. Should not really be confusing though.

@NickCloudAT
Copy link
Contributor Author

First tests seem to be working as expected on my end.

@TimGoll
Copy link
Member

TimGoll commented Jan 5, 2025

yeah, we should probably extend the parenting system to dropdown menus as well. It would be a bit more complex through

@NickCloudAT
Copy link
Contributor Author

yeah, we should probably extend the parenting system to dropdown menus as well. It would be a bit more complex through

Yeah.. I looked at the vgui stuff cause I wanted to know how that works.. Then I said "nope" and went on with just this PR..
I mean, nothing that can't be changed later.. Also, like said, I don't think it's actually confusing to not grey out those two sliders.. for now

@NickCloudAT
Copy link
Contributor Author

Not really able to give a full overview of it in this video, but you at least see the settings and the change in the Scoreboard:

2025-01-06.13-04-11.mp4

Everything else I was able to test was successful.. A MapVote always triggered at the right moment (only testet with PAM though).

@NickCloudAT NickCloudAT marked this pull request as ready for review January 6, 2025 15:45
@TimGoll
Copy link
Member

TimGoll commented Jan 6, 2025

Looks good to me, I'd replace "mapvote" with "map change", since the vote is only there with map vote addons. Also just replace "TTT(2)" with TTT2 imho.

@NickCloudAT
Copy link
Contributor Author

Looks good to me, I'd replace "mapvote" with "map change", since the vote is only there with map vote addons. Also just replace "TTT(2)" with TTT2 imho.

Yeahh after I wrote it I was pretty sure somebody will tell me to change that :P
I will do so.

@NickCloudAT
Copy link
Contributor Author

Should be good now..
Oh well, I just noticed with his PR that here are many new DE language lines that need to be translated.. Well well

Also: Will add a changelog now as I forgot that...

Copy link
Member

@TimGoll TimGoll left a comment

Choose a reason for hiding this comment

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

But make sure to add empty lines at file endings:

image

@NickCloudAT
Copy link
Contributor Author

But make sure to add empty lines at file endings:

image

ah, yeah thats not done automatically.. Well, fixed.

@TimGoll TimGoll added this to the v0.14.1b milestone Jan 7, 2025
@TimGoll TimGoll added the type/enhancement Enhancement or simple change to existing functionality label Jan 7, 2025
@TimGoll TimGoll merged commit cc08870 into TTT-2:master Jan 7, 2025
5 checks passed
@TimGoll TimGoll mentioned this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/enhancement Enhancement or simple change to existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants