Dean Herbert
89eded457c
Fix weird margins on loading display in lounge
2021-08-13 14:27:28 +09:00
smoogipoo
755b6460b6
Fix multiplayer navigation test failure
2021-08-13 14:05:44 +09:00
Dean Herbert
8fd6a9eb4b
Update framework
2021-08-13 14:01:38 +09:00
smoogipoo
2850f6ce95
Privatise counter again
2021-08-13 13:24:05 +09:00
Dean Herbert
e93660c0f4
Update resources
2021-08-13 13:19:34 +09:00
LiangXiang Shen
cbeecff347
Apply suggestions from code review
...
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-13 12:17:38 +08:00
smoogipoo
ee034874bb
Merge branch 'master' into remove-comments-page
2021-08-13 13:17:13 +09:00
smoogipoo
e913c8f92f
Change strings to verbatim
2021-08-13 13:07:02 +09:00
Bartłomiej Dach
70005cb39d
Merge branch 'master' into multiplayer-team-vs-results
2021-08-12 20:39:48 +02:00
Bartłomiej Dach
53b4cdfb02
Handle ties in team vs. results screen
2021-08-12 20:38:24 +02:00
Bartłomiej Dach
f06f13215b
Split off multiplayer team results screen to separate class
...
The previous version tried to keep both normal multiplayer and team
multiplayer results as one screen, but didn't check that team-specific
components aren't null in `LoadComplete()`.
To decrease number of conditional, split off the team results screen to
a separate implementation, and choose one or the other at push time in
`MultiplayerPlayer`, depending on team count.
2021-08-12 20:01:31 +02:00
Bartłomiej Dach
828268ad4d
Add winner text background to increase contrast
2021-08-12 19:34:25 +02:00
Bartłomiej Dach
4d26bb6714
Scale score panel to remove overlap with team score display
2021-08-12 19:27:32 +02:00
Dean Herbert
00ca066c39
Merge pull request #14202 from gagahpangeran/changelog-supporter
...
Add supporter promo section in changelog overlay
2021-08-13 00:33:57 +09:00
Gagah Pangeran Rosfatiputra
66ba24e865
create local link flow container
2021-08-12 20:36:47 +07:00
Gagah Pangeran Rosfatiputra
40db228e91
change to osu text flow container
2021-08-12 19:34:44 +07:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign
2021-08-12 21:00:46 +09:00
Salman Ahmed
bb1d74255e
Remove unrequired parenthesis
2021-08-12 14:16:20 +03:00
Salman Ahmed
3d7866e82d
Calculate horizontal offset on present overlays only
2021-08-12 14:15:01 +03:00
smoogipoo
83703e4283
Add colour provider to online play dependencies
2021-08-12 20:08:14 +09:00
smoogipoo
03351cf434
Add blur to background
2021-08-12 20:01:53 +09:00
smoogipoo
050f2d6b0d
Add background to room subscreen
2021-08-12 19:51:03 +09:00
smoogipoo
047b37788b
Merge online play filter control with the lounge subscreen
2021-08-12 19:48:15 +09:00
Dean Herbert
e89aea1fc2
Add some padding between scroll bar and content
2021-08-12 19:47:26 +09:00
Dean Herbert
10195e0c53
Add total user count
2021-08-12 19:47:26 +09:00
Dean Herbert
7b66616dc4
Simplify logic and test/fix edge case
2021-08-12 19:47:26 +09:00
Dean Herbert
8a67304b9f
Fix recent participants hidden user logic not handling edge case correctly
...
Hiding just one user never makes sense, so this will now always show up
to the required circle count until two users are required to be hidden.
This will make the listing more consistent with the width requirement
spec.
2021-08-12 19:47:26 +09:00
Dean Herbert
127fd4d292
Match font weight of design for hidden user count
2021-08-12 19:47:26 +09:00
Dean Herbert
2c07b68f6f
Fix incorrect colour for hidden user display
2021-08-12 19:47:26 +09:00
Dean Herbert
512382987e
Add colour provider for multiplayer usage
2021-08-12 19:47:26 +09:00
smoogipoo
ab7bd1df9d
Use full-screen background
2021-08-12 19:27:06 +09:00
Gagah Pangeran Rosfatiputra
18684ad21f
remove colour creation in add link
2021-08-12 17:08:54 +07:00
Gagah Pangeran Rosfatiputra
98859b3759
cache pink colour provider
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 17:06:11 +07:00
Gagah Pangeran Rosfatiputra
8b29f52d9f
update supporter note text
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 16:54:58 +07:00
Salman Ahmed
b58b5ec2b4
Apply horizontal offset changing once per frame
...
The previous way was causing every-frame invalidation when an overlay is
visible.
2021-08-12 12:44:38 +03:00
smoogipoo
b75c20fee4
Adjust positioning and paddings
2021-08-12 18:02:00 +09:00
smoogipoo
3b7aa262d5
Make header overlap content
2021-08-12 16:52:35 +09:00
smoogipoo
d07bb10d02
Remove breadcrumbs from header
2021-08-12 16:52:30 +09:00
Dean Herbert
ab1cc6ad48
Fix padding around recent participants icon being uneven
2021-08-12 16:50:09 +09:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign
2021-08-12 16:31:14 +09:00
Dean Herbert
e84224f64c
Rename AddPlayer
method now that there's no conflict
2021-08-12 16:20:37 +09:00
Dean Herbert
68dbbc17e8
Add support for automatic scrolling in gameplay leaderboard
2021-08-12 16:20:37 +09:00
Dean Herbert
4d6101f4e5
Lease selected room while in match screen to avoid lounge potentially changing it
2021-08-12 14:56:58 +09:00
kj415j45
3f434c8474
Resolve code quality issue
2021-08-12 13:42:16 +08:00
kj415j45
ac52b89148
Add Maintenance and Debug SettingsStrings
2021-08-12 12:34:10 +08:00
kj415j45
9d391ad138
Add OnlineSettingsStrings
2021-08-12 12:34:09 +08:00
kj415j45
61502e977a
Add SkinSettingsStrings
2021-08-12 12:34:08 +08:00
kj415j45
31ffaf15d4
Add GameplaySettingsStrings
2021-08-12 12:34:07 +08:00
kj415j45
7adf2bb64c
Add UserInterfaceStrings
2021-08-12 12:34:06 +08:00
kj415j45
03013d0d30
Add InputSettingsStrings
...
Existed strings files keep no change
2021-08-12 12:34:06 +08:00
kj415j45
2cc89f50cc
Add missing key
2021-08-12 12:34:05 +08:00
kj415j45
b2986e99d3
Add AudioSettingsStrings
2021-08-12 12:34:04 +08:00
kj415j45
078953980e
Add GraphicsSettingsStrings
2021-08-12 12:34:03 +08:00
kj415j45
9a5d4ffd43
Add GeneralSettingsStrings
2021-08-12 12:34:02 +08:00
kj415j45
97041de09f
Preparation for localisation.
2021-08-12 12:34:02 +08:00
Dan Balasescu
88f70e7f29
Merge branch 'master' into multiplayer-kick-support-events
2021-08-12 12:12:06 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support
2021-08-12 11:46:56 +09:00
PercyDan
6ecc728c01
Remove override
2021-08-12 10:27:36 +08:00
PercyDan
d80a2dcca7
Missed one
2021-08-12 10:14:01 +08:00
PercyDan
18ecd8758b
Make Perfect auto restart toggleable
2021-08-12 10:12:35 +08:00
smoogipoo
543482111b
Remove outdated todo
2021-08-12 10:40:14 +09:00
smoogipoo
c160e50f4f
Merge branch 'master' into multiplayer-team-vs-leaderboard
2021-08-12 10:27:31 +09:00
smoogipoo
bbb28d1b29
Don't use null-propagation for status
2021-08-12 09:14:46 +09:00
smoogipoo
58d76e9036
Use FinishTransforms()
2021-08-12 09:13:10 +09:00
PercyDan
4706dcf525
Merge branch 'master' of https://hub.fastgit.org/ppy/osu into auto-restart
2021-08-11 20:18:05 +08:00
Dean Herbert
31608a1bc6
Leave the match screen when kicked
2021-08-11 19:57:10 +09:00
Dean Herbert
9b21ebd6d0
Add client side handling on incoming kick
2021-08-11 19:56:06 +09:00
Dean Herbert
d9a4f018e6
Add event flow for receiving kick commands
2021-08-11 19:56:06 +09:00
smoogipoo
4002a1606e
Round star ratings before comparing
2021-08-11 18:20:39 +09:00
smoogipoo
eb59f3c591
Revert "Buffer the entire star rating range to fix overlapping alpha"
...
This reverts commit c680012523
.
2021-08-11 18:15:53 +09:00
smoogipoo
0f5bea235c
Merge branch 'master' into lounge-redesign
2021-08-11 18:15:34 +09:00
Dan Balasescu
369794501b
Merge branch 'master' into update-framework
2021-08-11 18:11:36 +09:00
Dean Herbert
d6352637d6
Also add tooltip and context menu item
2021-08-11 17:45:34 +09:00
Dean Herbert
bb51ebd0ef
Don't show button on self
2021-08-11 17:42:46 +09:00
Dean Herbert
7aab8c32ec
Add kick button and hook up logic
2021-08-11 17:31:54 +09:00
Dean Herbert
e8ad0fba75
Add required server methods for kicking users
2021-08-11 17:20:41 +09:00
Dean Herbert
3f067e3a8d
Remove likely unnecessary score null check
2021-08-11 16:59:42 +09:00
Dean Herbert
d1dfb785d8
Merge branch 'master' into context-menu-sounds
2021-08-11 16:21:13 +09:00
Dean Herbert
f8683e2256
Update framework
2021-08-11 16:17:21 +09:00
Dean Herbert
a223f111cb
Move text to avoid overlapping the results panel
2021-08-11 15:50:01 +09:00
Dean Herbert
430a0e496c
Add winner text
2021-08-11 15:32:14 +09:00
Dean Herbert
c376e652a4
Convey and show team scores at the multiplayer results screen
2021-08-11 15:32:14 +09:00
Dean Herbert
735c5085dd
Fix match score display not doing an initial value update
2021-08-11 14:50:47 +09:00
Gagah Pangeran Rosfatiputra
fb7ed08bab
move text creation to load method
2021-08-11 12:49:22 +07:00
Dean Herbert
ee3b373e8a
Correctly handle tied scores
2021-08-11 14:48:37 +09:00
Dean Herbert
cf82bca09c
Change logic to only handle the case of exactly two teams
2021-08-11 14:44:13 +09:00
Gagah Pangeran Rosfatiputra
6d763ca3c7
Merge branch 'master' into changelog-supporter
2021-08-11 10:47:51 +07:00
Dean Herbert
a3a9d0579f
Adjust checkbox / sliderbar animation speeds to match sound effects better
2021-08-11 12:33:14 +09:00
Dan Balasescu
56b23fc765
Merge branch 'master' into context-menu-sounds
2021-08-11 11:46:10 +09:00
Bartłomiej Dach
4268e4d750
Fix nested menus layering close samples if multiple menu levels are closed
2021-08-10 20:40:53 +02:00
Dean Herbert
58db6b758d
Update resources
2021-08-10 18:47:39 +09:00
Dean Herbert
60302e3daa
Update framework
2021-08-10 18:46:20 +09:00
Dean Herbert
a503274e1d
Pass through MultiplayerRoomUser
s instead of int
s to avoid re-retrieval
2021-08-10 18:39:20 +09:00
Dan Balasescu
b8748a86c5
Merge pull request #14204 from peppy/fix-null-ref-online-tracking-component
...
Fix potential null reference in online status resolution in multiplayer match
2021-08-10 18:36:13 +09:00
Dan Balasescu
33d4d635f2
Merge branch 'master' into fix-dho-state-overwrite
2021-08-10 17:55:18 +09:00
Dan Balasescu
9cda5235a0
Merge branch 'master' into fix-dho-state-overwrite
2021-08-10 17:40:36 +09:00
Dean Herbert
b121d95400
Avoid potential null reference exception in OnlinePlayBeatmapAvailabilityTracker
2021-08-10 17:37:24 +09:00
Dean Herbert
d9b5f235d8
Add xmldoc explaining thread safety limitations of IModelManager
"events"
2021-08-10 17:36:59 +09:00
Dan Balasescu
91c3396b24
Merge branch 'master' into add-playlist-item-download-progress
2021-08-10 17:25:27 +09:00
Gagah Pangeran Rosfatiputra
93408c636b
hide supporter promo section for supporter
2021-08-10 14:56:54 +07:00
Gagah Pangeran Rosfatiputra
3fb2ca4f4a
add border bottom
2021-08-10 14:55:57 +07:00
Dean Herbert
2b9168157d
Fix CurrentMatchPlayingItem
not being reset on leaving a multiplayer room
2021-08-10 16:53:03 +09:00
ekrctb
c63dfa21e1
Always initialize DHO transforms on LoadComplete
...
With the previous commit, the transform application is skipped when the state is already changed. But it turns out the previous commit breaks slider animation in the standard editor. This is probably due to the transforms are applied before nested hit objects are added.
2021-08-10 16:34:38 +09:00
Gagah Pangeran Rosfatiputra
f7a02219b8
fix font size description
2021-08-10 14:23:15 +07:00
Gagah Pangeran Rosfatiputra
b3fbf52571
add pippi and heart texture
2021-08-10 14:07:20 +07:00
Gagah Pangeran Rosfatiputra
49de8ce1df
fix up some layouting
2021-08-10 13:53:06 +07:00
Gagah Pangeran Rosfatiputra
7c8df57109
add description text
2021-08-10 13:21:23 +07:00
Dean Herbert
3aa72163f2
Add simple download progress display to download buttons on playlist items
2021-08-10 15:14:43 +09:00
Gagah Pangeran Rosfatiputra
a2b4f05ebe
add border radius and shadow
2021-08-10 12:11:21 +07:00
Gagah Pangeran Rosfatiputra
0b41731d0b
initial changelog supporter promo section
2021-08-10 11:43:11 +07:00
Dean Herbert
498daef998
Merge branch 'master' into multiplayer-team-vs-leaderboard
2021-08-10 13:09:15 +09:00
Dan Balasescu
6da977f99a
Merge pull request #14178 from peppy/simplify-player-users-test-usage
...
Simplify method of marking players as playing in test scenes
2021-08-10 12:49:38 +09:00
TheOmyNomy
c5b490c441
Use non linear colour interpolation for legacy health display
2021-08-10 11:29:31 +10:00
TheOmyNomy
76e5a40b8e
Remove unnecessary "in" keyword
2021-08-09 20:53:02 +10:00
Dean Herbert
58714dbe71
Fix ordering of teams to match colours
2021-08-09 19:48:53 +09:00
Dean Herbert
490f9e1848
Fix overlap in spectator view
2021-08-09 19:45:16 +09:00
Dean Herbert
fe7c1d0181
Merge branch 'simplify-player-users-test-usage' into multiplayer-team-vs-leaderboard
2021-08-09 19:24:35 +09:00
Dean Herbert
ea6e441dec
Simplify method of marking players as playing in test scenes
2021-08-09 19:21:22 +09:00
Dean Herbert
551929cf5a
Simplify method of marking players as playing in test scenes
2021-08-09 19:18:13 +09:00
Dean Herbert
5f3d087101
Also add team score display to multiplayer spectator screen
2021-08-09 19:17:51 +09:00
Dean Herbert
121648b593
Add gameplay-specific team score display which can expand and contract
2021-08-09 19:17:51 +09:00
TheOmyNomy
24accdcab0
Add LegacyUtils class with non linear colour interpolation method
2021-08-09 18:56:47 +10:00
Dean Herbert
ebbf6467e8
Support more than two teams
2021-08-09 17:23:02 +09:00
Dean Herbert
cdc173e867
Add tracking of team totals to leaderboard implementation
2021-08-09 17:08:32 +09:00
Dean Herbert
77c9aadd05
Add team colour support to multiplaye gameplay leaderboard panels
2021-08-09 17:06:25 +09:00
Dean Herbert
e1d4eee1d2
Add the ability to set custom overriding colours on GameplayLeaderboardScore
s
2021-08-09 17:06:21 +09:00
Dean Herbert
1e5d9003d3
Add the ability for tests to alter the room and user states which during testing
2021-08-09 16:58:36 +09:00
Dean Herbert
1f69c61fd8
Update framework
2021-08-09 16:38:21 +09:00
Dean Herbert
0fa1f085df
Store MultiplayerRoomUser
as part of tracked data
2021-08-09 16:31:18 +09:00
Dean Herbert
fcec714b4f
Add safeties to avoid MultiplayerPlayer
crashing when beatmap can't be loaded
2021-08-09 16:31:18 +09:00
Dean Herbert
aa4c6b9341
Bring across tournament score display for game usage
2021-08-09 16:30:37 +09:00
Dean Herbert
e08b1223ab
Move team colours to OsuColour
2021-08-09 16:30:37 +09:00
Dean Herbert
f4739d0118
Remove MaskingSmoothness
to avoid making sheered container blurry
2021-08-09 16:28:43 +09:00
Dean Herbert
0b76460043
Merge branch 'master' into lounge-redesign
2021-08-09 16:28:28 +09:00
Dean Herbert
a12f6b78a4
Split status retrieval into its own method
2021-08-09 16:21:12 +09:00
Dean Herbert
7cb743a734
Move font sizing to base class
2021-08-09 16:17:51 +09:00
Dean Herbert
db270a79ab
Update resources
2021-08-08 03:54:20 +09:00
Dean Herbert
404a4234cb
Merge branch 'master' into more-missing-sounds
2021-08-08 03:49:17 +09:00
Salman Ahmed
d099bb8ab6
Calculate offsets from overlay ScreenSpaceDrawQuad
s instead
2021-08-07 21:08:26 +03:00
Salman Ahmed
19a19f915c
Adjust settings panel to autosize to zero when hiding it
...
Previously, when hiding the settings overlay, it remains to have a width
of `56` (sidebar width), this is due to the panel content being placed
next to the sidebar, so therefore the content has to move 400
(PANEL_WIDTH) + 56 (sidebar_width) backwards, for the overlay to have a
width of 0 on hide.
2021-08-07 21:07:08 +03:00
Salman Ahmed
9f3013e2c8
Remove all HorizontalScreenOffset
calculations from overlays
2021-08-07 19:30:12 +03:00
Salman Ahmed
e924ea8d93
Make ScreenOffsetContainer
privatly settable only
2021-08-07 18:52:27 +03:00
Bartłomiej Dach
ff1730f9f8
Do not play open/close samples for top-level menus
2021-08-07 14:38:54 +02:00
Salman Ahmed
9ac5c9aa2f
Fix notification overlay having incorrect initial X
2021-08-07 01:27:54 +03:00
Salman Ahmed
8dc0650ca7
Add test coverage
2021-08-06 22:56:43 +03:00
Salman Ahmed
ac157f6cef
Fix settings panel children not processing transforms while masked away
2021-08-06 22:36:26 +03:00
Dean Herbert
2f187cb90f
Update framework
2021-08-07 01:17:58 +09:00
Salman Ahmed
f77037ef57
Replace state-based screen offsetting logic with HorizontalScreenOffset
s
2021-08-06 18:38:57 +03:00
Salman Ahmed
8e8e0fb8d8
Add placement-dependent horizontal screen offset properties
2021-08-06 18:38:15 +03:00
Salman Ahmed
067ff0e0ad
Store last opened settings subpanel rather than relying on LINQ
2021-08-06 18:38:15 +03:00