1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 15:17:31 +08:00
Commit Graph

9569 Commits

Author SHA1 Message Date
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
8249ce7988
Merge branch 'master' into multiplayer-header-redesign 2021-08-12 21:00:46 +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
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
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
smoogipoo
543482111b Remove outdated todo 2021-08-12 10:40:14 +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
Dean Herbert
31608a1bc6 Leave the match screen when kicked 2021-08-11 19:57:10 +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
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
3f067e3a8d Remove likely unnecessary score null check 2021-08-11 16:59:42 +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
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
Dean Herbert
a503274e1d Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval 2021-08-10 18:39:20 +09: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
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
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 GameplayLeaderboardScores 2021-08-09 17:06: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
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
Lucas A
5e0f9d0af9 Localise user ratings. 2021-08-08 22:00:12 +02:00
Jamie Taylor
5031b19b42
Add sounds to multiplayer games list 2021-08-06 23:39:42 +09:00
Salman Ahmed
b01893d3f2
Merge branch 'master' into star-rating-display-v2 2021-08-06 13:51:34 +03:00
Dan Balasescu
8f014650df
Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud 2021-08-06 19:36:19 +09:00
Dean Herbert
724edcbecd Toggle the expanded state of the multiplayer leaderboard with the user's HUD
Resolves https://github.com/ppy/osu/discussions/14140.

---

Until now, the multiplayer leaderboard would expand during break time.
Now, it respects the user's HUD visibility status (which can be toggled
using Shift+Tab).
2021-08-06 19:23:44 +09:00
smoogipoo
c680012523 Buffer the entire star rating range to fix overlapping alpha 2021-08-06 19:06:16 +09:00
smoogipoo
19ed24a06f Remove unnecessary duplicate background 2021-08-06 18:59:19 +09:00
Dean Herbert
b401dc0b2e Remove playlist button 2021-08-06 18:58:50 +09:00
smoogipoo
9019e0947a Remove unused using 2021-08-06 18:54:02 +09:00
smoogipoo
798b16fc24 Remove unused params 2021-08-06 18:52:46 +09:00
smoogipoo
bdfdd00afe Adjust spacings and sizings of left-side details 2021-08-06 18:52:01 +09:00
Dean Herbert
6164903fec
Merge branch 'master' into new-difficulty-colours 2021-08-06 18:05:53 +09:00
smoogipoo
74bffeac5e Minor design adustments (paddings/sizing) 2021-08-06 17:03:44 +09:00
smoogipoo
0ea982c036 Update recent participants list to use participant_count 2021-08-05 22:49:41 +09:00
smoogipoo
fd6d488657 Add thousands separator to rank range pill 2021-08-05 21:40:09 +09:00
smoogipoo
c74e620ce9 Add constant for background colour 2021-08-05 21:39:51 +09:00
smoogipoo
87fd1eaf06 Explain negative padding 2021-08-05 21:19:23 +09:00
smoogipoo
438f0ce702 Increase default number of avatars 2021-08-05 21:18:30 +09:00
smoogipoo
2f2e3d7366 Use higher res background image 2021-08-05 21:01:21 +09:00
smoogipoo
b8ec1cb984 Hide star rating max display for equal difficulties 2021-08-05 21:00:28 +09:00
smoogipoo
bd394d9377 Fix pluralisation 2021-08-05 20:56:23 +09:00
smoogipoo
5521f38cfb Adjust spacing 2021-08-05 20:56:09 +09:00
smoogipoo
0246e6f850 Merge branch 'master' into lounge-redesign 2021-08-05 19:55:15 +09:00
Dan Balasescu
0211521a97
Merge branch 'master' into multiplayer-create-with-enter 2021-08-05 17:07:03 +09:00
Dan Balasescu
5811dff853
Merge pull request #14120 from peppy/multiplayer-team-vs-team-selection
Add ability to choose Team Versus match type and view / switch teams
2021-08-05 17:02:14 +09:00
Dean Herbert
2b973b9831 Redirect beatmap selection to intentionally click the button directly 2021-08-05 14:21:51 +09:00
Dean Herbert
bf720f7e06 Ensure operations are not performed during loading 2021-08-05 14:14:07 +09:00
Dean Herbert
22bd6c7556 Move keyboard progress flow handling to MatchSettingsOverlay 2021-08-05 14:06:58 +09:00
Dean Herbert
fd54487186 Add safety against pushing to non-current screen 2021-08-05 14:06:58 +09:00
Dean Herbert
2ccf7e75b0 Fix new possible nullref inspection due to delegate initialisation in constructor 2021-08-05 13:24:59 +09:00
Dean Herbert
c84bd2c74d Update new obsolete usages 2021-08-05 13:22:59 +09:00
Salman Ahmed
b2332eb5b3 Use new difficulty colours permanently 2021-08-04 18:19:37 +03:00
Salman Ahmed
d4399f10f9 Merge both variants of the star rating display 2021-08-04 18:19:28 +03:00
Salman Ahmed
d0ce0cf9f5 Merge branch 'master' into new-difficulty-colours 2021-08-04 17:12:15 +03:00
smoogipoo
3b6771ca65 Remove todo 2021-08-04 22:09:03 +09:00
smoogipoo
fbf89493ad Merge branch 'master' into lounge-redesign 2021-08-04 19:53:55 +09:00
Dean Herbert
476442d1a3
Merge branch 'master' into multiplayer-create-with-enter 2021-08-04 19:37:41 +09:00
Dan Balasescu
5a6636ae5c
Merge pull request #14116 from peppy/update-platform-action-triggers
Update existing test to make use of `ManualInputManager.Keys`
2021-08-04 19:36:39 +09:00
Dean Herbert
42e14fb492 Merge branch 'update-platform-action-triggers' into multiplayer-create-with-enter 2021-08-04 17:31:38 +09:00
Dean Herbert
9b9dacf3fe Update usages of Drawable.Click() 2021-08-04 17:30:33 +09:00
smoogipoo
c06fffb56a Increase background image resolution 2021-08-04 13:49:13 +09:00
Salman Ahmed
b5970d5cdc Handle pitch black background case 2021-08-04 01:52:48 +03:00
Dean Herbert
aa320c70a7 Improve show/hide animation and add more padding around the crown 2021-08-03 23:42:37 +09:00
Dean Herbert
b8e878ccc9 Add the ability to change team by clicking current team colour
Definitely not the final UX, but it's what people are used to and easy
to implement, so it'll do for now.
2021-08-03 23:42:37 +09:00
Dean Herbert
5e59b1325c Add team display to participant list 2021-08-03 23:42:37 +09:00
Dean Herbert
b956d32587 Add the ability to change multiplayer game type 2021-08-03 23:42:37 +09:00
Dean Herbert
c856611f65 Merge branch 'master' into multiplayer-match-rulesets 2021-08-03 23:40:24 +09:00
Salman Ahmed
9a5e052dc0 Use star difficulty colour spectrum game-wide 2021-08-03 15:02:18 +03:00
smoogipoo
50f6632051 Fix duplicate RoomManager 2021-08-03 20:38:50 +09:00
smoogipoo
1b6b7ce343 Merge branch 'master' into lounge-redesign 2021-08-03 20:02:31 +09:00
Dean Herbert
063868713e Add ability to create a room using only keyboard input 2021-08-03 19:11:10 +09:00
Dean Herbert
feadfbcca7 Add playlist type to picker temporarily 2021-08-03 17:48:20 +09:00
Dean Herbert
01f15bd6fc Rename picker class to match new naming 2021-08-03 17:47:53 +09:00
Dean Herbert
a42762e351 Merge branch 'multiplayer-rename-game-type' into multiplayer-match-rulesets 2021-08-03 14:55:51 +09:00
Dean Herbert
2564c0c3df Rename GameType to MatchType and make enum instead of class 2021-08-03 14:46:31 +09:00
Dean Herbert
867426441e Fix weird access to room via Client 2021-08-02 18:50:22 +09:00
Salman Ahmed
a75da82986 Add explaining comment 2021-08-01 21:14:54 +03:00
Salman Ahmed
ac930b8918 Fix judgement processors provided to mods while not completely loaded 2021-08-01 19:16:30 +03:00
Dean Herbert
48b95ae250
Merge pull request #14067 from nekodex/select-sfx-changes
Swap 'select' sample variants and add hover+select sounds to more components
2021-07-31 20:03:08 +09:00
Dean Herbert
081dafc4e4 Update existing inline usages to use new extension method 2021-07-31 16:46:02 +09:00
Jamie Taylor
c1d8a7e2ad
Add and use 'Submit' select sample variant for particular components 2021-07-30 21:35:28 +09:00
Jamie Taylor
be3c02ff7f
Remove 'Soft' select sample variant usage (soft is the new default) 2021-07-30 21:35:27 +09:00
Joseph Madamba
451c65a2c8 Fix song progress graph not being correctly hidden 2021-07-29 23:41:01 -07:00
Bartłomiej Dach
0691c0dd63
Switch Colour{Display,Palette} to use Colour4 2021-07-29 23:14:32 +02:00
Henry Lin
89e8296eb1 Reset all types of adjustments in MusicController; Rename AllowRateAdjustments to AllowTrackAdjustments 2021-07-29 15:39:26 +08:00
Bartłomiej Dach
239b38a0ab
Reduce implicit conversions by using default 2021-07-27 21:46:29 +02:00
Lucas A
94877117b9 Apply changes in-line with framework changes. 2021-07-27 18:22:47 +02:00
Dan Balasescu
488dd3ea52
Merge pull request #13980 from peppy/fix-online-song-select-background
Fix song select background not showing in multiplayer/playlists
2021-07-26 15:16:39 +09:00
Dean Herbert
3770193ede Fix keyboard navigation at multiplayer lounge not iterating in correct order 2021-07-26 13:49:09 +09:00
Salman Ahmed
749d7a7b24 Fix DrawableRoom swallowing mouse down events before reaching its container 2021-07-26 04:41:47 +03:00
Dan Balasescu
ce30bd8cc7
Merge pull request #14003 from Game4all/localise-profile-overlay-header-stats
Localise profile overlay numeric statistics
2021-07-25 12:20:38 +09:00
Lucas A
ff3d38de6f Localise accuracy display. 2021-07-23 22:37:08 +02:00
Dean Herbert
50a2abbe7f
Merge pull request #12683 from frenzibyte/legacy-beatmap-combo-offset
Apply combo offsets "colour hax" only on beatmap skins
2021-07-23 14:30:18 +09:00
Salman Ahmed
7bc30b46ff Use BindValueChanged with last running immediately instead 2021-07-23 07:51:58 +03:00
Salman Ahmed
ee3791ccf2 Update colours once on TimelineHitObjectBlueprint 2021-07-23 06:25:56 +03:00
Dean Herbert
a5736085a9 Ensure externally run operations on LoungeSubScreen are run after load is completed 2021-07-23 02:23:37 +09:00
Salman Ahmed
523c154f15 Add ComboIndexWithOffsetsBindable and bind similar to ComboIndexBindable 2021-07-22 16:40:33 +03:00
Dean Herbert
29ffae4025
Merge pull request #13967 from nekodex/new-select-sounds
Add new 'soft' select sound variant and use it in some places
2021-07-22 16:21:03 +09:00
Dean Herbert
8b1202153a
Merge pull request #13951 from LumpBloom7/timeline-object-interactions
Make timeline blueprints outside of TimelineBlueprint boundaries interactable
2021-07-22 16:20:22 +09:00
Dean Herbert
957a0686ed Split out nested classes from TimelineBlueprintContainer
They got too big.
2021-07-22 15:48:08 +09:00
Dean Herbert
b5cc9010de Move resolved property to top of class 2021-07-22 15:39:01 +09:00
Dean Herbert
ec3ce57bb9 Fix song select background not showing in multiplayer/playlists
The screen was now being loaded against incorrect dependencies. I'm not
sure why I thought it wasn't possible to just do the `Push` in
`LoadComplete` as it seems to work without issue this time...

Closes #13974.
2021-07-22 14:33:08 +09:00
Henry Lin
aab7678a69 Truncate beatmap text 2021-07-22 12:18:37 +08:00
Jamie Taylor
507b53dc73
Use 'Soft' hover/select samples for EditorTable row selection 2021-07-21 22:02:40 +09:00
Derrick Timmermans
9d43ca122f
Allow context menus to be triggered as well 2021-07-21 12:04:09 +02:00
Dan Balasescu
4c63e8e036
Merge pull request #13964 from peppy/fix-mod-overflow
Fix mod display overflowing on contracted results panels
2021-07-21 18:52:00 +09:00
Derrick Timmermans
f85ff40a6b
Add back LeftMouse button check 2021-07-21 11:47:21 +02:00
Dean Herbert
adda96ac86
Merge pull request #13962 from ekrctb/platform-action
Adapt to framework `PlatformAction` type change
2021-07-21 18:17:38 +09:00
Dean Herbert
a261f1ef8f
Merge pull request #13960 from ekrctb/selection-box-can-flip
Allow specifying different value of scaling and flipping support for a selection box
2021-07-21 18:05:18 +09:00
Dan Balasescu
b390018e64
Merge branch 'master' into fix-mod-overflow 2021-07-21 17:26:47 +09:00
Dan Balasescu
b556d6d382
Merge pull request #13963 from peppy/tidy-mod-display
Tidy up `ModDisplay`
2021-07-21 17:26:39 +09:00
Dean Herbert
b910c21230 Add ModFlowDisplay and consume in ContractedPanelMiddleContent 2021-07-21 16:53:04 +09:00
Dean Herbert
5bee06fd5f Remove forgotten AutoSize specification 2021-07-21 16:43:29 +09:00
Dean Herbert
396ad79d50 Remove unnecessary UnbindAll call 2021-07-21 16:43:08 +09:00
Dean Herbert
a63065dbe9 Tidy up ModDisplay 2021-07-21 16:38:25 +09:00
ekrctb
1bac471b49 Adapt to PlatformAction type change 2021-07-21 16:12:53 +09:00
ekrctb
1bff4373b3 Allow specifying flipping support of selection box different from scaling 2021-07-21 15:59:45 +09:00
Dan Balasescu
3121836741
Merge pull request #13942 from peppy/fix-autoplay-results-timestamp
Avoid showing time of play on results screen when autoplay
2021-07-21 15:37:31 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +02:00
Derrick Timmermans
a8cf6a6854
Fix slight Y position offset in HandleDrag 2021-07-20 23:00:58 +02:00
Derrick Timmermans
bfec87b082
Let TimelineBlueprintContainer only accept positional input within timeline quad 2021-07-20 22:30:50 +02:00
Derrick Timmermans
8b09ddbcd6
Merge branch 'ppy:master' into timeline-object-interactions 2021-07-20 16:36:39 +02:00
Dan Balasescu
738d321788
Merge pull request #13946 from peppy/fix-online-play-sub-screens-not-async-loaded
Fix `OnlinePlayScreen` sub-screens not loaded asynchronously
2021-07-20 19:51:13 +09:00
Dean Herbert
d066ebcd70
Merge pull request #12682 from frenzibyte/refactor-combo-colour-retrieval
Refactor combo colours retrieval to use skin config lookups instead
2021-07-20 19:47:57 +09:00
Dean Herbert
8e1f8c28bd Use default value to denote no play date, rather than null 2021-07-20 19:05:08 +09:00
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded 2021-07-20 18:47:41 +09:00
Dean Herbert
d87ea741ed Fix OnlinePlayScreen sub-screens not loaded asynchronously 2021-07-20 16:38:39 +09:00
Salman Ahmed
1af230c48c Merge branch 'master' into refactor-combo-colour-retrieval 2021-07-20 10:08:25 +03:00
Dean Herbert
fe414b942f Ensure online play subscreen is loaded before forwarding OnExiting
Closes https://github.com/ppy/osu-framework/issues/4619 (actually not a
framework issue; the framework correctly guards against this scenario,
see
4e29504384/osu.Framework/Screens/ScreenStack.cs (L277)).

Added the assertions to be very explicit about the nested stack's state
at this point. Both of those events can only be triggered if the stack
has a loaded screen (as far as I can tell), making this check
unnecessary in those cases.
2021-07-20 15:51:34 +09:00
Dean Herbert
662822a40c Avoid showing time of play on results screen when autoplay
Closes https://github.com/ppy/osu/issues/13940.
2021-07-20 15:19:44 +09:00
Dean Herbert
844152e1b1
Merge pull request #13861 from peppy/add-password-support
Add multiplayer room password support
2021-07-19 23:32:28 +09:00
Dan Balasescu
6e104fe084
Merge pull request #13894 from peppy/fix-beat-synced-container-alt
Fix multiple issues with `BeatSyncedContainer`
2021-07-19 23:19:20 +09:00
smoogipoo
6a55cb9df0 Revert unintended change
It's a deeper issue with ScreenStack (see:
https://github.com/ppy/osu-framework/issues/4619).
2021-07-19 22:52:07 +09:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f Fix compile error 2021-07-19 22:23:31 +09:00
smoogipoo
b7c2d6b1ab Merge branch 'master' into add-password-support 2021-07-19 22:23:09 +09:00
Dan Balasescu
5ef1fe6948
Merge branch 'master' into fix-replay-date 2021-07-19 21:58:37 +09:00
Dan Balasescu
f3bcaf7f11
Merge pull request #13929 from peppy/i-deep-cloneable
Create a deep clone of score for score submission purposes
2021-07-19 21:58:27 +09:00
smoogipoo
3168a927dc Fix possible exception 2021-07-19 20:50:30 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +09:00
Dean Herbert
b3f60c8253 Fix date being updated on replays unexpectedly 2021-07-19 19:28:35 +09:00
Dean Herbert
f16b4957aa Move clone to earlier in the process 2021-07-19 19:18:34 +09:00
Dan Balasescu
f1f6af88a1
Merge pull request #13926 from peppy/set-rank-on-failed-submission
Set score's rank on a failed submission
2021-07-19 18:45:21 +09:00
Dean Herbert
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
Dean Herbert
caba78cb5d Copy score during submission process to ensure it isn't modified 2021-07-19 14:14:28 +09:00
Dean Herbert
3c028ce05c Add IDeepCloneable interface and update existing CreateCopy methods to use it 2021-07-19 12:54:17 +09:00
Dean Herbert
d7f997a7f3 Set score's rank on a failed submission
As we don't have a `RankInfo.F`, this is the next best choice. I am also
adding a check osu-web side for this - this is just to make sure we
aren't sending scores with SS when they are not actually completed.

I'm working on a separate PR to ensure this does not get mutated during
the player exit process.
2021-07-19 12:36:15 +09:00
Derrick Timmermans
2e2a2bdd99
Allow moving timeline selection when mousedown event is outside of blueprint container 2021-07-18 18:06:59 +02:00
Derrick Timmermans
ee220feecf
Avoid using guesses to determine whether inputs blocked 2021-07-18 16:04:23 +02:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Dean Herbert
c966cb0530 Fix dependency lookup failing due to location of PopoverContainer 2021-07-17 15:04:18 +09:00
Dean Herbert
50eed26bd1 Rename radio button item to label 2021-07-17 02:32:23 +09:00
Dean Herbert
eac9b1ec7e Disable toolbox composition buttons when beatmap is not timed 2021-07-17 02:30:13 +09:00
Dean Herbert
3ae5f6707a Expose whether an EditorBeatmap has timing present or not via bindable 2021-07-17 02:30:00 +09:00
Dean Herbert
7a671754f2 Change RadioButton's object to a string 2021-07-17 02:29:31 +09:00
Derrick Timmermans
e35cff99c7
Pass on mouseDown input to timeline if no selection modification is made with that input 2021-07-16 17:21:43 +02:00
Derrick Timmermans
3e8a13bfbf
Allow interacting with timeline objects outside of drawable bounds 2021-07-16 16:16:34 +02:00
Dean Herbert
d0fc258886 Remove unused OsuLogo.BeatMatching 2021-07-15 15:11:42 +09:00
Dean Herbert
9d693c75cf Add Schedule to restore password text box focus behaviour 2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba Update to use OsuPopover implementation 2021-07-14 23:55:46 +09:00
Dean Herbert
b5dd9403b1 Merge branch 'master' into add-password-support 2021-07-14 23:53:03 +09:00
smoogipoo
dfe7cc40a9 Move create room button into the lounge 2021-07-14 18:55:01 +09:00
smoogipoo
3e6b9bd48d Add filter background 2021-07-14 18:24:30 +09:00
smoogipoo
c64230315f Adjust layouts 2021-07-14 18:10:59 +09:00
smoogipoo
0bfaf11d51 Remove/fix paddings in lounge 2021-07-14 17:46:52 +09:00
smoogipoo
f6b81b76e8 Add shadow 2021-07-14 17:46:32 +09:00
smoogipoo
da3b40a4dd Add default background to panel, reduce nesting 2021-07-14 16:56:46 +09:00
smoogipoo
e0c61c24b1 Remove spotlights glow 2021-07-14 16:51:31 +09:00
smoogipoo
0e89bafd17 Add special category pill + secondary background 2021-07-14 16:48:53 +09:00
smoogipoo
c5977f3318 Merge branch 'master' into lounge-redesign 2021-07-14 12:47:16 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
smoogipoo
b5d4b9444f wip 2021-07-13 16:51:29 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
smoogipoo
0cb80e105b Renamespace classes 2021-07-13 16:02:18 +09:00
smoogipoo
ab282b9e59 Remove RoomInspector from the lounge 2021-07-13 16:00:42 +09:00
smoogipoo
689cee832c Fix 1px gaps in DrawableRoom background 2021-07-13 15:50:46 +09:00
smoogipoo
8c4a257742 Add recent participants 2021-07-13 15:10:44 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
c6bd58ea4b Exit match sub screen when a room goes away
Closes #13847.

I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).

Manual testing on password branch (#13861) is possible since it
currently errors due to missing method on the live/dev servers.

- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Dean Herbert
4dea2d9778 Dismiss popovers on returning to lounge 2021-07-12 18:54:17 +09:00
Dean Herbert
bbc3a013c8 Use BasicPopover for now 2021-07-12 18:29:50 +09:00
Dean Herbert
b4ca6b6188 Update popover logic to take advantage of new explicit popup functionality 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc Make password popover display inside RoomsContainer rooms 2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00
Dean Herbert
3c49b46c5f Add lock overlay for rooms which are password protected 2021-07-12 18:22:52 +09:00
smoogipoo
c1fba3da6b Add solid background 2021-07-12 16:30:34 +09:00
smoogipoo
aba09b20a5 Add host under room title 2021-07-12 16:28:22 +09:00
smoogipoo
4ac812de86 Add rank range pill 2021-07-12 16:15:26 +09:00
Dean Herbert
08c40938db Add support for updating a room's password 2021-07-12 15:49:19 +09:00
Dean Herbert
4fd6f2101c Add password textbox input 2021-07-12 15:49:19 +09:00
Dean Herbert
24f330e5c1 Avoid MatchSettingsOverlay base class potentially accessing an uninitialised field 2021-07-12 15:49:19 +09:00
smoogipoo
435b4b0e6e Remove pill inheritance 2021-07-12 15:21:00 +09:00
smoogipoo
a8cbffa57e Add playlist count pill 2021-07-12 15:11:53 +09:00
smoogipoo
185e36bf97 Split pill display into abstract class 2021-07-12 15:11:10 +09:00
smoogipoo
b4b0b862ef Adjust some layout 2021-07-12 14:07:21 +09:00
smoogipoo
ac26374a93 Merge branch 'master' into lounge-redesign 2021-07-12 13:54:42 +09:00
Salman Ahmed
07ede7a147 Disallow custom rulesets from score submission 2021-07-11 03:34:57 +03:00
Dean Herbert
6a5f0e8237 Move handling of replay seek operations out of progress bar
This is in order to avoid using the now obsoleted property
`SliderBar.AllowKeyboardInputWhenNotHovered`
(see https://github.com/ppy/osu-framework/pull/4579).
2021-07-09 14:28:59 +09:00
Dean Herbert
e612d7568c
Merge pull request #13771 from LumpBloom7/volume-meter-switch
Add ability to navigate between volume meters via Alt+Left/Right arrows
2021-07-07 21:50:44 +09:00
Derrick Timmermans
4d7c744101
Fix failing test 2021-07-07 12:59:31 +02:00
smoogipoo
8929aa0ca7 Initial redesign of DrawableRoom 2021-07-07 14:47:24 +09:00
smoogipoo
2ddfa15a80 Redesign RoomStatusInfo 2021-07-07 14:47:24 +09:00
smoogipoo
c50e3fd317 Clean up selection box construction 2021-07-07 14:47:24 +09:00
Bartłomiej Dach
f45418dde7 Replace game-side directory/file selector with framework extensions 2021-07-06 22:11:54 +02:00
Derrick Timmermans
ffe18ebe51
Resolve build errors 2021-07-06 14:11:46 +02:00
Derrick Timmermans
07d54d261a
Let selection container handle manual selection changes 2021-07-06 13:24:18 +02:00
Derrick Timmermans
c5a0672277
Use IStateful<SelectionState> instead of ISelected 2021-07-06 12:07:25 +02:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes
Fix multiplayer test failures due to leaderboard load process
2021-07-06 16:33:41 +09:00
Dean Herbert
0658cfb986 Throw exceptions rather than silently failing if attempting to add a clock for a non-tracked user 2021-07-06 14:56:00 +09:00
Dean Herbert
1a6b8b2c73 Populate UserScores as early as possible to avoid weird ordering requirements 2021-07-06 14:53:31 +09:00
Bartłomiej Dach
686dd2b5ce Remove unused constant 2021-07-05 20:35:14 +02:00
Derrick Timmermans
d495196b66
Share item cycling logic with GameplayMenuOverlay 2021-07-05 19:22:55 +02:00
Dean Herbert
f5ddd2a53b Fix critical failure causing scores to not update on the leaderboard 2021-07-06 01:15:30 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
f1014af284 Move LoadComplete content to run after user retrieval has completed
Feels safer, I think.
2021-07-05 21:35:41 +09:00
Dean Herbert
459f9a0465 Handle nulls and fix missing documentation 2021-07-05 21:35:37 +09:00
Dean Herbert
77adf687c6 Consume ability to lookup multiple users in MultiplayerGameplayLeaderboard
Avoids syncrhonously blocking on asynchronous operations (which was
leading to LCA starvation in tests).
2021-07-05 19:56:37 +09:00
Dean Herbert
9c311a6d8a Add ability to lookup multiple users at once to UserLookupCache 2021-07-05 19:56:16 +09:00
Dean Herbert
229bba14e6 Fix master clock becoming incorrectly paused when all spectator players are too far ahead 2021-07-05 17:45:08 +09:00
Bartłomiej Dach
c143a50b73
Merge branch 'master' into fix-zero-hit-score-submit 2021-07-04 15:31:38 +02:00
Dean Herbert
7a710ceffe Check count as well (statistics can be populated with zero counts) 2021-07-04 16:41:09 +09:00
Dean Herbert
ef82528309 Don't attempt to submit score when nothing has been hit 2021-07-04 15:16:18 +09:00
Dean Herbert
ec71deec51 Remove some mentions of "lazer"
I am aware there are more throughout the codebase but intentionally left
the remaining mentioned for one reason or another. The intention here is
to mainly change user-facing versioning to change the positioning of the
"lazer" term (to be where we would expect "cuttingedge" or "beta" to
be).
2021-07-04 12:41:27 +09:00
Bartłomiej Dach
fbe3b447e5 Merge branch 'master' into linkify-metadata 2021-07-03 15:51:08 +02:00
Dan Balasescu
ace57a9ee9
Merge pull request #13727 from peppy/update-disclaimer
Update disclaimer
2021-07-02 21:08:43 +09:00
Dan Balasescu
9eb6ae4d45
Merge pull request #13721 from peppy/submit-on-player-exit
Submit scores on player exit
2021-07-02 18:25:26 +09:00
Dean Herbert
362816492f Move to more friendly namespace 2021-07-02 18:09:16 +09:00
Dean Herbert
eacf867073 Move shared types into their own classes 2021-07-02 18:05:00 +09:00
Dean Herbert
f689e788c9 Avoid using game-wide beatmap during score submission 2021-07-02 14:24:27 +09:00
Dean Herbert
62c125d7a2 Tidy up font formatting methods 2021-07-02 12:21:28 +09:00
Dean Herbert
f0727a63be Reduce usable width 2021-07-02 12:18:52 +09:00
Dean Herbert
a1eaf39645 Slightly change wording to hopefully read better 2021-07-02 12:15:16 +09:00
smoogipoo
4c95af4b16 Add star rating range display 2021-07-01 20:35:31 +09:00
Dean Herbert
4c1b8bc427 Update disclaimer 2021-07-01 20:23:12 +09:00
Dean Herbert
0522500a57 Fix a couple of merge oversights 2021-07-01 19:45:17 +09:00
Dean Herbert
31dbc7798b Merge branch 'master' into linkify-metadata 2021-07-01 19:41:33 +09:00
smoogipoo
a78d1b4c2e Update SR colours to match osu-web 2021-07-01 19:37:21 +09:00
Dean Herbert
74c63e15be Mark score failed on fail and exit 2021-07-01 17:48:09 +09:00
Dean Herbert
04b874bb00 Add flow for submitting score on exiting SubmittingPlayer 2021-07-01 17:02:33 +09:00
Dean Herbert
5bc970af0d Make TestPlayer inherit from SoloPlayer for more flexibility in testing 2021-07-01 16:55:33 +09:00
Dean Herbert
00d3baef11 Exit handling flow 2021-06-30 20:23:48 +09:00
smoogipoo
6dd3c6fe93 Make MultiSpectatorScreen and tests more resillient to timing 2021-06-29 22:45:51 +09:00
smoogipoo
bfdbe3c3fe Fix clocks getting added a second time 2021-06-29 17:29:25 +09:00
smoogipoo
8e04d73b67 Merge branch 'rework-multiplayer-test-scenes' into spectator-start-at-end-2 2021-06-29 17:06:57 +09:00
smoogipoo
bcdf36e77b Merge branch 'master' into spectator-start-at-end-2 2021-06-29 15:53:58 +09:00
smoogipoo
92fa99700e Merge branch 'master' into rework-multiplayer-test-scenes 2021-06-29 15:39:59 +09:00
smoogipoo
a3b1e1d5fc Check for null ruleset in FilterCriteria 2021-06-29 15:18:40 +09:00
Dean Herbert
f939e2603a Merge branch 'master' into localisable-tooltips 2021-06-28 15:29:42 +09:00
Gagah Pangeran Rosfatiputra
2b1d3c8e9c
add od filter in search filter 2021-06-26 21:05:01 +07:00
Gagah Pangeran Rosfatiputra
8e1bcc4d6b
add overall difficulty in filter criteria 2021-06-26 21:02:31 +07:00
Bartłomiej Dach
ea384332c3
Merge branch 'master' into logo-transition-sound 2021-06-25 21:12:48 +02:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
aitani9
6bc71590c5 Disable logo click sound when exiting 2021-06-25 09:21:26 -07:00