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.

Sign up for GitHub

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

Jump to bottom

Sync with Q2PRO: UI stuff #346

Merged
merged 14 commits into from
Oct 27, 2023
Merged

Sync with Q2PRO: UI stuff #346

merged 14 commits into from
Oct 27, 2023

Conversation

res2k
Copy link
Contributor

@res2k res2k commented Oct 15, 2023

A bunch of upstream changes/improvements to the UI.

@skullernet @res2k
Move va() call closer to the point of use.
a7d7029
@skullernet @res2k
Round scaled screen sizes to int.
b208ef5
@skullernet @res2k
Fix odd screen height issue with server browser menu.
9ef3e5a 
When screen height is odd, menu list height is one pixel off.
@skullernet @res2k
Apply screen scaling to demo bar.
e394b8d
@skullernet @res2k
Add comment that ‘color’ layout program keyword is Q2PRO extension.
4e94f3b
@skullernet @res2k
Fix UB when demo cache is corrupted.
4873bf3
@skullernet @res2k
Make UI realtime unsigned.
1f80b76
@skullernet @res2k
Use float for demo position percentage.
c4e9f20
@skullernet @res2k
Subtract first frame offset from MVD position.
20393be
@skullernet @res2k
Change demo progress range to [0, 1].
4d769e0
@skullernet @res2k
Add a hack for action mod scope scaling.
40d7754
@skullernet @res2k
Reset ‘hand’ to 0 if out of range rather than clamping.
b3a1dd7 
Game has special cases only for values 1 and 2 and all other values
should be equivalent to 0.
@skullernet @res2k
Clean up and fix Com_ParseColor().
f29b17a 
Explicitly check for negative value, because whether color_index_t is
signed or unsigned type is implementation defined.
@skullernet @res2k
Keep aspect ratio when drawing console/menu background.
479d6a9 
Fixes NVIDIA#296.
@apanteleev apanteleev merged commit 274a41f into NVIDIA:master Oct 27, 2023
2 checks passed
apanteleev added a commit that referenced this pull request Oct 27, 2023
@apanteleev
Fixed the status bar rendering that was broken in commit 40d7754 (MR #…
9e0554b 
…346)
@apanteleev
Copy link
Collaborator

Hi @res2k - thanks for yet another package of q2pro changes.
After merging this, I noticed that the status bar rendering was somewhat broken, so it's fixed in 9e0554b. You might want to follow up with q2pro to see if the same bug exists there.

@res2k
Copy link
Contributor Author

res2k commented Oct 28, 2023

After merging this, I noticed that the status bar rendering was somewhat broken

Oops

You might want to follow up with q2pro to see if the same bug exists there.

The code in Q2PRO looks different around the line you changed; it does value = cl.frame.ps.stats[value]; instead of ...[index]; the latter is a Q2RTX-specific change introduced in 2d5c6a7.

@res2k res2k deleted the q2pro-sync-ui branch October 28, 2023 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@res2k @apanteleev @skullernet