1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Commit Graph

10739 Commits

Author SHA1 Message Date
Dan Balasescu
8e014ca17a Reverse in-match playlist 2021-11-16 00:31:46 +09:00
Dan Balasescu
eb983ed548 Fix potential crash from playlist updating during async load 2021-11-16 00:02:38 +09:00
Dan Balasescu
f743a3647f Rename APIPlaylistItem -> MultiplayerPlaylistItem 2021-11-15 23:14:27 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Dean Herbert
960cecf3db Merge branch 'beatmap-collection-inteface-types' into i-working-beatmap/difficulty-calculator 2021-11-15 19:16:47 +09:00
Dean Herbert
5489b19c57 Update PlaylistItem to use IRulesetInfo 2021-11-15 16:13:03 +09:00
Dean Herbert
1988b263c6 One more missed usage.. 2021-11-15 16:02:08 +09:00
Dean Herbert
73cb80d8a4 Update one more missed usage 2021-11-15 16:00:45 +09:00
Dan Balasescu
5e2ccd5c85 Merge branch 'master' into multi-queueing-modes 2021-11-15 15:26:34 +09:00
Dean Herbert
285b161da7 Update other usages of online ID comparisons to use new extension method 2021-11-15 14:44:08 +09:00
Dean Herbert
5471994450
Merge branch 'master' into sample-point-multiple 2021-11-15 14:13:58 +09:00
Dean Herbert
fdbb59fd1d
Merge branch 'master' into gameplay-test/share-clock-state 2021-11-15 13:49:17 +09:00
Dean Herbert
a4aa008793 Fix frequency ramping a second time incorrectly after fail 2021-11-14 14:41:17 +09:00
Bartłomiej Dach
6b4b6de554
Fix test gameplay starting in a hidden state 2021-11-13 22:11:00 +01:00
Bartłomiej Dach
2562412125
Propagate clock state from gameplay test back to editor 2021-11-13 22:11:00 +01:00
Bartłomiej Dach
d2ddc25ab3
Propagate clock state from editor to gameplay test 2021-11-13 22:10:59 +01:00
Bartłomiej Dach
9a19a516f9
Adjust spacings on sample point piece popover 2021-11-13 21:59:45 +01:00
Bartłomiej Dach
73ca1d39a2
Improve sample bank text box UX in case of multiple selection 2021-11-13 21:59:44 +01:00
Bartłomiej Dach
3fee6b0938
Add support for setting sample bank & volume for multiple objects at once 2021-11-13 21:24:59 +01:00
Bartłomiej Dach
9800cd4903
Add test coverage for sample control point piece operation 2021-11-13 18:14:50 +01:00
Dean Herbert
983d5a6cb8
Merge branch 'master' into difficulty-point-multiple 2021-11-13 23:47:12 +09:00
Bartłomiej Dach
5f2a789a6d
Ensure editor clock is stopped before testing gameplay 2021-11-13 14:01:00 +01:00
Bartłomiej Dach
eb8c5292d5
Ensure editor background is dimmed after return from gameplay test 2021-11-13 13:50:57 +01:00
Bartłomiej Dach
b47c0b63f4
Tweak loader transition when testing gameplay in editor 2021-11-13 13:39:18 +01:00
Bartłomiej Dach
a5ba3bd012
Move gameplay test pieces to own namespace 2021-11-13 13:39:17 +01:00
Bartłomiej Dach
e1c28ddd76
Adjust difficulty point popover content spacing 2021-11-12 23:32:12 +01:00
Bartłomiej Dach
d567d2be97
Fix multiple issues with textbox content display
- Sometimes would display too many decimal digits due to floating point
  representation errors.

- Placeholder would also look wrong if text was removed during a
  multiple (but determinate) selection.
2021-11-12 23:32:12 +01:00
Bartłomiej Dach
e55e2a1697
Allow to adjust slider velocity on multiple objects simultaneously 2021-11-12 23:32:11 +01:00
Bartłomiej Dach
7ba93aac27
Add test coverage for difficulty point piece operation 2021-11-12 22:16:09 +01:00
Dan Balasescu
3b24ec3643 Merge branch 'master' into multi-queueing-modes 2021-11-12 22:16:04 +09:00
Dean Herbert
d2d66766d4
Merge branch 'master' into songselect-audio-improvements 2021-11-12 19:40:04 +09:00
Dean Herbert
338e5a78b8 Adjust easing of logo to better match the sound
I'm sure we can come up with something better, but giving it a bit more
speed definitely feels closer to what the sound is portraying.
2021-11-12 19:30:35 +09:00
Dean Herbert
692e846acd Rename BeatmapSetInfo.OnlineBeatmapSetID to OnlineID to match interface 2021-11-12 17:52:44 +09:00
Dean Herbert
6a098a8634 Rename BeatmapInfo.OnlineBeatmapID to OnlineID to match interface 2021-11-12 17:46:24 +09:00
Bartłomiej Dach
759450502f
Merge branch 'master' into pp-counter-fixed-width 2021-11-12 08:05:56 +01:00
Dean Herbert
54ae307a3d Trigger test via button click when using keyboard shortcut 2021-11-12 14:42:33 +09:00
Jamie Taylor
113c95f3f5
Only apply high-pass temporarily 2021-11-12 14:22:43 +09:00
Dean Herbert
62600f1390
Merge branch 'master' into editor-gameplay-test 2021-11-12 14:14:06 +09:00
Dean Herbert
e891c0ce53 Add keyboard shortcut to start test mode in editor 2021-11-12 14:13:11 +09:00
Dean Herbert
321aa456a7 Adjust button size slightly 2021-11-12 14:04:34 +09:00
Dean Herbert
b9f9c27770 Standardise spacing and padding between UR and PP counters 2021-11-12 13:59:22 +09:00
Dean Herbert
e31ea49dd4 Use fixed width font for performance points counter
Matches all other display counters for in-game metrics.

As mentioned in https://github.com/ppy/osu/discussions/15584.
2021-11-12 13:18:47 +09:00
Bartłomiej Dach
c465bcb821
Ensure track is stopped on player completion 2021-11-11 20:54:36 +01:00
Bartłomiej Dach
385df51b06
Ensure editor test player is exited on completion 2021-11-11 20:54:36 +01:00
Bartłomiej Dach
59727ce836
Add minimal implementation of gameplay testing from editor 2021-11-11 20:54:35 +01:00
Bartłomiej Dach
b66758dac7
Fix missing unsubscribe from JudgementReverted 2021-11-11 18:11:18 +01:00
Bartłomiej Dach
32b5a736c8
Add preview gameplay button to bottom editor bar 2021-11-11 17:12:21 +01:00
Bartłomiej Dach
2e3acffd1d
Perform initial update of PP counter value on load complete 2021-11-11 16:33:33 +01:00
Dan Balasescu
07a7b4bcdc Merge branch 'master' into multi-queueing-modes 2021-11-11 22:19:30 +09:00
Bartłomiej Dach
576417947e
Round unstable rate in counter rather than truncating 2021-11-11 13:36:06 +01:00
Bartłomiej Dach
69809390d3
Fix HUD unstable rate counter not including judgements before load complete
Also unifies UR calculation logic with the results screen statistic item
to reduce duplication.
2021-11-11 13:36:05 +01:00
Jamie Taylor
069ee6980f
Add debounce to sample playback 2021-11-11 19:20:50 +09:00
Dan Balasescu
4db2ad1cb3
Merge branch 'master' into rename-ef-model-properties 2021-11-11 19:12:54 +09:00
Dean Herbert
51a353e12d Rename BeatmapInfo.Version to DifficultyName to match underlying interface 2021-11-11 17:20:53 +09:00
Dean Herbert
ebe58cee11 Rename BeatmapInfo.StarDifficulty to StarRating to match underlying interface 2021-11-11 17:19:46 +09:00
Bartłomiej Dach
9664b9a97c
Fix being able to switch own team by clicking other players' team indicators 2021-11-11 09:01:50 +01:00
Jamie Taylor
e33c1f9a41
Lower filter cutoff frequency 2021-11-11 11:00:55 +09:00
Dean Herbert
8371307709
Merge branch 'master' into editor-clipboard-refactor 2021-11-11 01:09:39 +09:00
Bartłomiej Dach
30efc589d1
Fix logo sample always playing in main menu when initially logged out 2021-11-10 14:03:34 +01:00
Bartłomiej Dach
b25ad8dfcb
Copy editor timestamp to OS clipboard even when triggered via menu bar
Would only work when triggered via Ctrl+C before, and not work at all
for Ctrl+X.
2021-11-10 12:49:10 +01:00
Bartłomiej Dach
5e31e890ae
Extract class for clipboard contents for DI purposes 2021-11-10 12:36:23 +01:00
Dan Balasescu
aad4b8ff80 Fix ready button remaining enabled for expired items 2021-11-10 18:42:46 +09:00
Dan Balasescu
02efe24e39 Fix checksum not passed to AddPlaylistItem 2021-11-10 18:36:55 +09:00
Dan Balasescu
c7381b4df0 Fix host check
Although the underlying issue is that the host user is not populated.
Not sure whether this should be fixed at all.
2021-11-10 18:36:22 +09:00
Jamie Taylor
b13d020a49
Don't re-use confim-selection sample for the skip intro button 2021-11-10 17:15:08 +09:00
Jamie Taylor
5f462b6441
Move beatmap/difficulty change sample playback to outside of debounce 2021-11-10 17:15:08 +09:00
Jamie Taylor
8d0f5b0d82
Add high-pass filter when song selection is confirmed 2021-11-10 17:15:08 +09:00
Jamie Taylor
6dc13ef396
Use default hover sample instead of song-ping (they're the same sample anyway) 2021-11-10 17:14:20 +09:00
smoogipoo
35a5182ebf Merge branch 'master' into multi-queueing-modes 2021-11-10 15:01:13 +09:00
Dean Herbert
328c72c358 Fix TeamDisplay not showing after changing to team versus 2021-11-10 13:44:31 +09:00
Dean Herbert
52c740b377 Add failing test showing team display display failure 2021-11-10 13:44:31 +09:00
Bartłomiej Dach
042b05a250
Move clipboard action availability logic down to editor screens 2021-11-09 19:54:37 +01:00
Bartłomiej Dach
286754f6f7
Move clipboard operation implementation down to current screen 2021-11-09 19:54:37 +01:00
Bartłomiej Dach
74c37e248d
Merge branch 'master' into master 2021-11-09 08:40:52 +01:00
Chinmay Patil
d5ad776c33 Remove decimal part of UR Counter and rename methods 2021-11-08 06:27:25 -07:00
smoogipoo
c716051530 Merge branch 'master' into multi-queueing-modes 2021-11-08 19:19:50 +09:00
Dean Herbert
97345ac9e6 Remove unnecessary TimeSpan timeout parameter (CancellationToken can now be used) 2021-11-08 14:33:32 +09:00
Dean Herbert
e338340c6a Merge branch 'master' into beatmap-cancellation-token 2021-11-08 14:32:56 +09:00
Dean Herbert
78aef9ce86
Merge branch 'master' into remove-stupid-weak-reference-bindable-events 2021-11-08 13:35:49 +09:00
Dan Balasescu
da0d9726f5
Merge pull request #15466 from peppy/user-class-cleanup
Clean up `User` class
2021-11-08 13:27:26 +09:00
Dean Herbert
8dbe69dec5
Merge pull request #15515 from Joehuu/fix-statistics-loading-spinner
Fix loading spinner potentially showing on statistics unavailable message
2021-11-08 13:02:39 +09:00
Dean Herbert
62600b47b1 Merge branch 'master' into user-class-cleanup 2021-11-08 12:51:12 +09:00
Joseph Madamba
9e13c20bd4 Move spinner hiding before newScore null check 2021-11-07 19:35:30 -08:00
Joseph Madamba
ac5d9853d3 Fix loading spinner potentially showing on statistics unavailable message 2021-11-07 17:25:33 -08:00
Chinmay Patil
a8c9ad73c1 Make UR Counter isValid into a bindable boolean 2021-11-07 18:06:13 -07:00
Chinmay Patil
cc0bcf6b2c Clean up judgement checks and clean up setter/getter for UR counter Text 2021-11-07 17:44:50 -07:00
Bartłomiej Dach
6d30248cef
Merge branch 'master' into use-class-rename 2021-11-07 15:41:00 +01:00
Dean Herbert
0ecf5f201c Rename User to APIUser and move to correct namespace 2021-11-07 11:26:01 +09:00
Tollii
cf0b757b16 Fix PR comments.
Nitpick, more cancellation token checks.
2021-11-06 16:03:53 +01:00
Tollii
f0caa10066 Add support for a provided cancellation token for GetPlayableBeatmap() 2021-11-05 23:53:48 +01:00
Chinmay Patil
77e853ce25 Optimized UR Counter and removed redundant code 2021-11-05 12:16:58 -06:00
Dean Herbert
54f72d68ca Revert weird event flow in model manager/importers 2021-11-05 19:12:49 +09:00
smoogipoo
e6deb0c873 Merge branch 'master' into multi-queueing-modes 2021-11-05 15:57:25 +09:00
Dean Herbert
6399c695e8 Update usages of BufferedContainer in line with framework changes 2021-11-05 15:54:49 +09:00
Chinmay Patil
8bfcb89221 Fixed issue where UR counter was always invalid 2021-11-04 21:24:25 -06:00
Chinmay Patil
0ffd41bb70 Slight logical error in the setValid method 2021-11-04 14:32:28 -06:00
Chinmay Patil
8923561b05 Removed Unnessicary class in the Test file, and optimized UR counter 2021-11-04 14:27:48 -06:00
Dean Herbert
7049d0de66 Merge branch 'master' into beatmap-refactor/remove-online-info 2021-11-05 01:16:11 +09:00
Chinmay Patil
a76878e053 A bit more formatting 2021-11-04 09:52:16 -06:00
Chinmay Patil
c568888500 Edited to remove unessicary blank lines 2021-11-04 09:47:52 -06:00
Dean Herbert
ed07ee8c61 Update all existing usages of AuthorString/AuthorId
Unfortunately the getters need to be left in place else EF breaks.
2021-11-04 18:59:37 +09:00
Dan Balasescu
45dcf187b9
Merge branch 'master' into beatmap-refactor/playlist-use-api-beatmap-extended 2021-11-04 18:59:04 +09:00
Dean Herbert
86540d1fb6 Update existing usages of Author as string to access Username directly 2021-11-04 18:57:54 +09:00
Dean Herbert
b9983add15 Rename User to APIUser and move to correct namespace 2021-11-04 18:21:31 +09:00
Dean Herbert
df3c3a32ce Fix unintentionally broken background update logic 2021-11-04 18:07:39 +09:00
Dean Herbert
d2831b1152 Merge branch 'beatmap-refactor/remove-online-info' into beatmap-refactor/to-model-removal-2 2021-11-04 17:09:50 +09:00
Dean Herbert
c820d445ad
Merge pull request #15461 from peppy/fix-more-computationally-expensive
Fix a few more "maybe null" inspections
2021-11-04 16:49:38 +09:00
Dean Herbert
317506d4d7 Fix a few more "maybe null" inspections 2021-11-04 16:11:23 +09:00
Dean Herbert
09701d0af1 Use explicit primitive type specification 2021-11-04 16:02:37 +09:00
Dean Herbert
0f4f1349db Merge branch 'master' into editor-context-menu-on-select 2021-11-04 15:59:06 +09:00
Dean Herbert
a5a7181915 Fix unintentionally broken background update logic 2021-11-04 15:35:32 +09:00
Dean Herbert
9c926e5514 Remove BeatmapSetInfo.OnlineInfo and all usages 2021-11-04 15:23:04 +09:00
Dean Herbert
0d0eab90bc Merge branch 'beatmap-refactor/playlist-use-api-beatmap-extended' into beatmap-refactor/remove-online-info 2021-11-04 15:23:02 +09:00
Dean Herbert
d1e6d1cb98 Update some other missed incorrect null/empty usages 2021-11-04 14:50:43 +09:00
Dean Herbert
a49366ff84 Remove nullability from IBeatmapInfo.Metadata 2021-11-04 14:28:39 +09:00
Dean Herbert
67d9590a79 Fix new inspections 2021-11-04 14:02:09 +09:00
Dean Herbert
0df339d0b8 Fix incorrect invocation of download method in SoloSpectator 2021-11-04 13:50:04 +09:00
Dean Herbert
9f9c960fe3 Revert PlaylistItem.APIBeatmap to be private 2021-11-04 13:36:32 +09:00
Dean Herbert
05f1fd4bc9 Remove unnecessary properties and parameters 2021-11-04 13:33:54 +09:00
Chinmay Patil
9aa3021bbc Added Unstable Rate Counter as a skinable element 2021-11-03 22:22:44 -06:00
Dean Herbert
3453160a8b Change PlaylistItem.Beatmap to be an IBeatmapInfo 2021-11-04 13:16:56 +09:00
Dean Herbert
6fdeb66dc1 Use APIBeatmap instead of BeatmapInfo in playlist display classes where feasible 2021-11-04 11:55:50 +09:00
Bartłomiej Dach
098fa181b4
Fix text flow wrapping incorrectly in multiplayer usages 2021-11-03 18:36:43 +01:00
Bartłomiej Dach
ed00cd9fc5
Remove simple localisable .ToString() calls 2021-11-02 21:42:02 +01:00
Bartłomiej Dach
11de924704
Use LocalisableStrings where possible to leverage localisable text flow 2021-11-02 21:42:02 +01:00
Bartłomiej Dach
ad98ab0a26
Fix drawable room playlist item assuming single sprite text 2021-11-02 21:42:02 +01:00
Bartłomiej Dach
b95c95527e
Accept LocalisableStrings in LinkFlowContainer 2021-11-02 21:42:01 +01:00
Bartłomiej Dach
98367fc482
Update usages of GetLocalised{-> Bindable}String 2021-11-02 21:42:01 +01:00
Dean Herbert
6efd3d3115 Don't perform background difficulty calculation for multiplayer panels
There are cases these are shown in a long list. They shouldn't be
running calculations.
2021-11-03 03:12:52 +09:00
smoogipoo
3db199292f Fix queue mode not passed from room to settings overlay 2021-11-01 18:52:57 +09:00
smoogipoo
65b920e4c1 Merge branch 'master' into multi-queueing-modes 2021-11-01 18:37:16 +09:00
Dean Herbert
b21e0e7efb Merge branch 'beatmap-refactor/get-and-present' into beatmap-refactor/beatmap-overlays 2021-11-01 18:07:51 +09:00
Dean Herbert
b98faf6159 Merge branch 'master' into score-refactor/isolated-serialisation 2021-11-01 15:49:25 +09:00
Dan Balasescu
9e633a1b17
Merge pull request #15321 from peppy/beatmap-refactor/download-tracker
Replace `DownloadTrackingComposite` with instantiable `DownloadTracker` components
2021-11-01 15:48:12 +09:00
Dean Herbert
123b10f647 Fix playlist item download button being clickable when it shouldn't 2021-11-01 15:10:32 +09:00
Dean Herbert
19feae4a8e
Merge branch 'master' into beatmap-refactor/download-tracker 2021-11-01 13:15:36 +09:00
Dean Herbert
02e69626e3 Reduce fail animation tint slightly 2021-11-01 13:06:26 +09:00
Bartłomiej Dach
914e5c0f9d
Fix star rating not updating for some mods on details tab in song select
`AdvancedStats` was locally assuming that the only changes in mods that
are relevant to it are if the mods are `IApplicableToDifficulty`. This
is not true, as other mods (such as `IApplicableToRate` mods, or more
recently, Flashlight) can also affect star difficulty, which is shown on
one of the bars in `AdvancedStats`.
2021-10-31 18:58:17 +01:00
Bartłomiej Dach
8053b2c320
Merge branch 'master' into score-refactor/isolated-serialisation 2021-10-30 15:07:34 +02:00
Dean Herbert
5311fe2d02
Merge branch 'master' into beatmap-refactor/beatmap-overlays 2021-10-29 22:37:29 +09:00
Dean Herbert
a16c8f1ebc Update all beatmap overlay views to use APIBeatmap/APIBeatmapSet 2021-10-29 18:50:55 +09:00
Dean Herbert
8ad33d43d0 Merge branch 'beatmap-refactor/get-and-present' into beatmap-refactor/beatmap-overlays 2021-10-29 18:01:17 +09:00
smoogipoo
e667ef4eea Add basic tests 2021-10-29 15:44:48 +09:00
Dean Herbert
3f030cebf4 Remove local score copying in GetScoresRequest to allow APIScoreInfo.Beatmap to be APIBeatmap 2021-10-29 14:14:25 +09:00
Dean Herbert
1944c255a7 Implement score interfaces 2021-10-29 13:49:30 +09:00
Bartłomiej Dach
6f863ca204
Adjust game-side text flow containers to part-based model 2021-10-29 06:34:08 +02:00
Dean Herbert
414d920ca2 Revert to previous exposure of RoomSubScreen.BeatmapAvailability 2021-10-29 12:02:10 +09:00
Dean Herbert
b252b176d4 Seal implementation and add comment about LoadComplete execution order 2021-10-29 11:59:07 +09:00
Dean Herbert
3b095e1626 Merge branch 'master' into beatmap-refactor/download-tracker 2021-10-29 11:50:54 +09:00
smoogipoo
f076b72fbe Merge branch 'master' into multi-queueing-modes 2021-10-29 10:48:16 +09:00
Dean Herbert
6f5040722a Merge branch 'master' into beatmap-refactor/uncontested 2021-10-28 16:37:26 +09:00
Dean Herbert
a9208838a9
Merge pull request #15307 from peppy/playlist-remaining-attempt-display
Show remaining attempts again on playlist screen
2021-10-28 05:28:20 +09:00
Dean Herbert
746d6a4c16 Fix some oversights and test failures 2021-10-27 23:42:27 +09:00
Dean Herbert
f014ceaead Update remaining usages of download tracking 2021-10-27 21:00:46 +09:00
Dean Herbert
f268363924 Update UpdateableBeatmapBackgroundSprite to accept IBeatmapInfo 2021-10-27 16:38:48 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Jason Won
c633e2e952 only propagate unmodified right click 2021-10-26 16:24:53 -04:00
Jason Won
f64fa65fd5 right click on unselected object shows context menu 2021-10-26 14:52:15 -04:00
Dean Herbert
c15bfb2cf4 Handle bindable changes to fix new playlist creation not showing correct details 2021-10-26 18:19:05 +09:00
Dean Herbert
42d8d4fd38 Add tooltips to start button to explain why it's not clickable 2021-10-26 18:06:08 +09:00
Dean Herbert
1c578f285a Disable playlist start button when attempts have been exhausted 2021-10-26 18:06:08 +09:00
Dean Herbert
bffd9162ba Tint attempt count red when no attempts remain 2021-10-26 18:06:08 +09:00
Dean Herbert
708d40931b Add back remaining attempt display on playlist room screen 2021-10-26 18:06:08 +09:00
Dean Herbert
ea55ba7ba9 Remove unused using statement 2021-10-26 16:08:21 +09:00
Dan Balasescu
7b8982c87c
Merge pull request #15302 from peppy/fix-multiplayer-chat-escape-focus
Fix gameplay chat display not losing focus on escape key press
2021-10-26 15:34:05 +09:00
Dan Balasescu
efe6763226
Merge branch 'master' into move-online-beatmap-metrics 2021-10-26 14:24:40 +09:00
Dean Herbert
6c38028d06 Fix gameplay chat display not losing focus on escape key press
Closes #15293.
2021-10-26 13:55:08 +09:00
Bartłomiej Dach
6802e9ec10
Remove FixedWidth and add AutoSizeAxes specs to all usages 2021-10-25 20:24:48 +02:00
Dean Herbert
2c308f3008 Rename BeatmapMetrics to APIFailTimes 2021-10-25 15:34:41 +09:00
Dean Herbert
20baae9094 Move online metrics out of BeatmapInfo model 2021-10-25 15:32:18 +09:00
Dean Herbert
045dd94a6e Move online metrics out of BeatmapSetInfo model 2021-10-25 15:12:39 +09:00
Dan Balasescu
c6ca0e5895
Merge branch 'master' into fix-password-popover-focus 2021-10-22 22:52:46 +09:00
smoogipoo
04b0529a7f Fix list overflowing subscreen background 2021-10-22 22:17:26 +09:00
smoogipoo
d7a98097a1 Make DrawableRoomPlaylist handle expired items 2021-10-22 21:04:52 +09:00
smoogipoo
95ab82fb58 Remove BeatmapSelectionControl and inline at usage sites 2021-10-22 19:41:36 +09:00
Dean Herbert
90477e3788 Remove unused BeatmapTypeInfo class
Helps reduce the scope of upcoming changes.
2021-10-22 19:13:50 +09:00
Dean Herbert
91cc77407d Fix low-pass filter continuing to take effect after fail animation has already ended 2021-10-22 17:02:02 +09:00
smoogipoo
db87e42d47 Remove beatmap/ruleset/etc from MultiplayerRoomSettings 2021-10-22 16:48:28 +09:00
Dean Herbert
c580ec865f APIBeatmapSet.Covers is never null 2021-10-21 19:34:01 +09:00
Dean Herbert
69e7810dad Enable nullable and switch classes to structs 2021-10-21 18:54:36 +09:00
smoogipoo
f41cf822b0 Rename request 2021-10-21 17:02:11 +09:00
Dean Herbert
0706ad70fb Move BeatmapSetOnlineInfo to an interface type 2021-10-21 16:58:42 +09:00
Bartłomiej Dach
9ad9465020
Remove online-screen-local textbox recolours 2021-10-20 22:49:25 +02:00
smoogipoo
691e414acb Add request to add a new playlist item 2021-10-20 21:08:58 +09:00
smoogipoo
67090fc598 Re-namespace enum 2021-10-20 20:52:16 +09:00
smoogipoo
599867a3b1 Add implementation to settings overlay 2021-10-20 20:29:06 +09:00
smoogipoo
0e446105fb Rename to "picking mode" as simpler english 2021-10-20 17:52:51 +09:00
smoogipoo
bc57190fb4 Make dropdown not move the selection control 2021-10-20 17:52:05 +09:00
smoogipoo
116ce09e49 Merge branch 'master' into multi-queueing-modes 2021-10-20 17:27:25 +09:00
smoogipoo
ea9c070e59 Add setting for queue mode 2021-10-20 14:51:59 +09:00
Dean Herbert
7cf4395875 Merge branch 'master' into default-value-indicator 2021-10-19 16:23:02 +09:00
Dean Herbert
480dc57102 Schedule joinFailed callback for added safety 2021-10-19 15:54:12 +09:00
Dean Herbert
da524261c0 Fix focus potentially being transferred too far up when password is being verified 2021-10-19 15:53:29 +09:00
Dean Herbert
a589964dc7 Centralise join logic 2021-10-19 15:53:29 +09:00
Dean Herbert
8944b1dd78 Add basic test coverage of DrawableLoungeRoom 2021-10-19 15:36:27 +09:00
Dean Herbert
473459d191 Add layout duration to PasswordEntryPopover to make error text look a bit smoother 2021-10-19 15:36:27 +09:00
Dean Herbert
d35fe5493a Change default value of DrawableLoungeRoom.matchingFilter so they display by default 2021-10-19 15:36:27 +09:00
sh0ckR6
e7b280fc81
Comment out RankDisplay
Commented out as it may be revisited at a later time.
Also currently unused.
2021-10-18 23:12:33 -04:00
Bartłomiej Dach
8db2fc439d
Change ruleset ID assert in player to null-check 2021-10-18 23:45:06 +02:00
Bartłomiej Dach
6d9d85685f
Fix settings item having zero height 2021-10-18 23:30:38 +02:00
Dan Balasescu
8643c725cc
Merge pull request #15175 from peppy/fail-animation-flash-controlled-by-setting
Don't flash screen red on fail if the user has disabled red tinting
2021-10-18 15:27:10 +09:00
Dean Herbert
762949f49f Don't flash screen red on fail if the user has disabled red tinting 2021-10-18 14:20:38 +09:00
Dean Herbert
59dc04017e Fix epilepsy warning not being faded out on an early exit from PlayerLoader 2021-10-18 13:30:37 +09:00
5ln
3529f34c98
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
Signed-off-by: 5ln <xnafumie@gmail.com>
2021-10-18 02:01:50 +08:00
Bartłomiej Dach
874decb3cd
Replace spectator-local fix for wrong ruleset ID with player-global consistency check 2021-10-16 16:10:42 +02:00
Dean Herbert
7a5a612896 Move retry and exit hotkey overlays to same depth / container 2021-10-16 02:29:45 +09:00
Dean Herbert
e9f50179ab
Merge branch 'master' into fail-animation-update 2021-10-15 23:32:10 +09:00
Dean Herbert
91754450b2 Remove dispose method completely 2021-10-15 21:27:44 +09:00
Dean Herbert
6f947cacbd Fix test failures 2021-10-15 21:22:38 +09:00
smoogipoo
2fd101ad50 Reorder elements to follow designs 2021-10-15 20:25:32 +09:00
smoogipoo
a70d7e4feb Remove unnecessary extra GridContainer 2021-10-15 20:18:25 +09:00
Dean Herbert
c47497923a Schedule drag events for now 2021-10-15 19:52:44 +09:00
Dean Herbert
30c3fcb4ea Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 19:45:04 +09:00
Dean Herbert
3909fd8caa Fix wonkiness when dragging slider end at high input refresh rates 2021-10-15 19:43:57 +09:00
Dean Herbert
b9fd1f52df Tweak animation slightly 2021-10-15 19:37:22 +09:00
Dean Herbert
b08743342b Fix incorrect nesting 2021-10-15 19:35:08 +09:00
Dean Herbert
66f3370a19 Add new fail animation to better match new sound effects 2021-10-15 19:14:59 +09:00
Dean Herbert
a59ee9ec1f
Merge pull request #15121 from nekodex/fail-highpass
Add high-pass filter to gameplay fail sequence
2021-10-15 19:14:44 +09:00
Jamie Taylor
8d6d7fcdbe
Add high-pass filter to gameplay fail sequence 2021-10-15 17:03:37 +09:00
Dan Balasescu
3604a762d0
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 16:58:01 +09:00
Dean Herbert
f73e505ee6 Further adjustments to glow to be less bright on settings overlay 2021-10-15 12:35:19 +09:00
Dean Herbert
3a25bdaf3d
Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 11:18:37 +09:00
Dean Herbert
874d722820
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 11:14:45 +09:00
Dean Herbert
ad0732484f Just wait for metadata section to be loaded 2021-10-14 22:12:38 +09:00
Dean Herbert
9d54285b2e Merge branch 'master' into fix-multiplayer-sounds-during-gameplay 2021-10-14 21:34:04 +09:00
Dean Herbert
06249c4ab2 Fix incorrect usages of Scheduler.AddOnce 2021-10-14 17:52:19 +09:00
Dean Herbert
0d86dab80a Fix multiplayer components updating when not alive
Should close https://github.com/ppy/osu/issues/15092.

- [ ] Depends on https://github.com/ppy/osu-framework/pull/4826.
2021-10-14 17:37:10 +09:00
smoogipoo
901f107b2e Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-14 17:25:51 +09:00
Dan Balasescu
fb9c3fe72e
Merge pull request #14619 from peppy/no-more-difficulty-control-points-info
Move `DifficultyControlPoint`s to be specified at a per-`HitObject` level
2021-10-14 17:24:32 +09:00
Dean Herbert
1212b08672 Fix gameplay audio ramping down in frequency a second time at the end of the fail sequence 2021-10-14 16:45:34 +09:00
Dean Herbert
e0babe4b79 Add global logging of WorkingBeatmap changes 2021-10-14 14:07:43 +09:00
Dean Herbert
09536cd733 Add logging of WorkingBeatmapCache.Invalidate calls 2021-10-14 14:05:33 +09:00
smoogipoo
aa380a11c1 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-14 12:02:10 +09:00
Dean Herbert
8d479bbe56
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-14 10:17:01 +09:00
Bartłomiej Dach
d2115824fa
Merge branch 'master' into dropdown-refresh 2021-10-13 23:53:14 +02:00
Bartłomiej Dach
f3647eb94e
Recolour room settings screens to match dropdown theming 2021-10-13 22:50:19 +02:00
Bartłomiej Dach
d067159435
Recolour elements of editor setup screen to match dropdown theming 2021-10-13 22:32:54 +02:00
smoogipoo
fdf7142711 Remove Room.Position 2021-10-13 21:24:54 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-13 20:17:57 +09:00
Dan Balasescu
d88daf0cc2
Merge pull request #15073 from peppy/fix-player-loader-low-pass
Improve `PlayerLoader` audio and visual transitions
2021-10-13 17:01:49 +09:00
Dean Herbert
02689a1b60 Use actual BeatmapInfo rather than PlayableBeatmap.BeatmapInfo for editor writes 2021-10-13 14:50:12 +09:00
Dean Herbert
26a1e40d24 Fix storyboard outro during fail test not being lenient enough 2021-10-13 13:48:57 +09:00
Dean Herbert
ae4dcbd829 Improve PlayerLoader audio and visual transitions 2021-10-13 13:26:20 +09:00
Dean Herbert
3d6602b8df Ensure FailAnimation is disposed synchronously to avoid test failures 2021-10-11 14:05:31 +09:00
Dean Herbert
794b4c46cf Split score counter class into two distinct classes to simplify usages 2021-10-10 17:56:32 +09:00
Dean Herbert
06cce0119c Use localisable format string for comma separator mode 2021-10-10 17:41:16 +09:00
Dean Herbert
446f091d32 Use comma separator for tournament score displays 2021-10-10 16:06:12 +09:00
smoogipoo
bc37cb6f43 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-08 18:41:17 +09:00
Dean Herbert
436ead421a Move low pass fail effect to FailAnimation 2021-10-08 12:27:04 +09:00
Dean Herbert
da96cc73d8 Fix dual specification of SuspensionHandler and move fields around slightly 2021-10-07 23:40:47 +09:00
Dean Herbert
310d7965b6 Merge branch 'master' into more-filter-effects 2021-10-07 20:52:38 +09:00
Dan Balasescu
f8e50731b7
Merge pull request #14991 from peppy/intro-tests-no-menu-load
Allow intro screens to be created without loading a `MainMenu`
2021-10-07 20:48:54 +09:00
Dean Herbert
ef64c64f0b
Merge branch 'master' into popup-filter-effect 2021-10-07 18:56:07 +09:00
Dan Balasescu
bece807857
Merge pull request #14980 from peppy/difficulty-move-to-beatmap
Copy `BaseDifficulty` to `Beatmap<T>` and move the majority of write operations across
2021-10-07 18:43:44 +09:00
Dean Herbert
f98dd1b811
Merge branch 'master' into popup-filter-effect 2021-10-07 18:40:21 +09:00
Jamie Taylor
cc209f0f2d
Add filter effect to fail sequence 2021-10-07 17:55:30 +09:00
Jamie Taylor
5c48340520
Add filter effect to beatmap loading 2021-10-07 17:55:21 +09:00
Dean Herbert
0df409c050 Move difficulty copy to BeatmapModelManager.Save 2021-10-07 17:16:45 +09:00
Dan Balasescu
d50443fdf2
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-07 16:50:10 +09:00
Dean Herbert
f88d898960 Allow intro screens to be created without loading a MainMenu 2021-10-07 16:38:22 +09:00
Dean Herbert
5f129ae33c Remove local overridden storage of Mods in Player
Not required and only causing headaches. Accessing mods should now be
done via `GameplayState`.

Closes #14912.
2021-10-07 14:53:39 +09:00
Dean Herbert
9705c7b546 Use cloned mods in one more place 2021-10-06 21:30:30 +09:00
Dean Herbert
433e7cd403 Fix rate mods not working if pp counter is displayed 2021-10-06 21:26:30 +09:00
Dean Herbert
4ca97bc60a
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-06 16:14:21 +09:00
Dean Herbert
222997f2b9 Copy difficulty settings back out to BeatmapInfo on editor changes 2021-10-06 15:19:26 +09:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
Dan Balasescu
e6aa05a4a4
Merge pull request #14978 from peppy/fix-editor-file-selector-textbox-drags
Fix dragging on an editor file selection text box causing repeated popover display
2021-10-06 13:52:08 +09:00
Dean Herbert
d9849bcf49 Fix dragging on an editor file selection text box causing repeated popover display
Local fix and no tests as this is a pretty weird usage of `TextBox`.
We'll probably want to change it to not use a textbox eventually.

Closes #14969.
2021-10-06 13:15:05 +09:00
Dan Balasescu
e837a3511d
Merge branch 'master' into beatmap-difficulty-more-interface-usage 2021-10-06 12:18:51 +09:00
Dan Balasescu
4bbff2ebf7
Merge branch 'master' into new-interfaces 2021-10-06 11:38:17 +09:00
Dan Balasescu
9491e5a547
Merge pull request #14954 from peppy/rename-result-response
Rename `APIRequest.Result` to `Response`
2021-10-06 10:52:33 +09:00
Dean Herbert
5a4474e1b2 Fix incorrect DI retrieval in ReplayDownloadButton 2021-10-06 05:29:00 +09:00
Dean Herbert
98fef6ece2 Handle judgement reverts with actual display updates 2021-10-05 19:08:30 +09:00
Dean Herbert
bd84a8b749 Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage 2021-10-05 18:21:21 +09:00
Dean Herbert
0859c336de Also dim counter during initial calculation phase 2021-10-05 17:24:36 +09:00
Dean Herbert
f64226ded6 Fix display not displaying correctly after initial load 2021-10-05 17:10:32 +09:00
Dean Herbert
599d82e383 Avoid returning a live IEnumerable 2021-10-05 17:01:07 +09:00
Dean Herbert
fa7f11d906 Add easing to rolling counter value 2021-10-05 16:51:49 +09:00
Dean Herbert
565e888f58 Tidy up attribute retrieval code 2021-10-05 16:40:07 +09:00
smoogipoo
45b63cbad9 Remove unnecessary dependency 2021-10-05 16:03:25 +09:00
Dean Herbert
676df55a0e Fade display out during rewind (as the value displayed is no longer valid) 2021-10-05 15:39:29 +09:00
Dean Herbert
81a13566bc Adjust default location slightly, fix alignment of "pp" subtext 2021-10-05 15:28:03 +09:00
Dean Herbert
b6af93d434 Apply some code quality refactoring 2021-10-05 15:14:49 +09:00
Dean Herbert
7176dc95e5 Revert Player.Score to protected 2021-10-05 14:55:40 +09:00
Dean Herbert
e19be8ebe4 Make GameplayState.Score immutable 2021-10-05 14:55:40 +09:00
Dean Herbert
d3b9660148 Move common interface implementations to extension methods 2021-10-05 14:41:14 +09:00
Dean Herbert
b41fa41c85 Rename APIRequest.Result to Response 2021-10-05 14:28:56 +09:00
smoogipoo
5624dd9af6 Fix incorrect CancellationToken usage
Apparently I wrote the BDL system and don't know how this works. I
believe you need `CancellationToken?` or CanBeNull=true, however that doesn't actually
play well when actually using the token in code...
2021-10-05 12:07:41 +09:00
smoogipoo
593da79bbc Further asyncify load process 2021-10-05 11:26:13 +09:00
smoogipoo
d120678e30 Fix redundant default value 2021-10-04 21:13:14 +09:00
smoogipoo
d1e7191f94 Pass score into GameplayState 2021-10-04 20:59:51 +09:00
smoogipoo
0b0316e27e Fix missing CanBeNull 2021-10-04 20:59:31 +09:00
smoogipoo
1837e1bf3c Share rounding with PerformanceStatistic 2021-10-04 20:35:53 +09:00
smoogipoo
fb63e5ed87 Add todo 2021-10-04 20:35:26 +09:00
smoogipoo
221cc1747c Drop "default" prefix 2021-10-04 20:34:28 +09:00
smoogipoo
5aae673240 Use GameplayState 2021-10-04 20:33:54 +09:00
smoogipoo
2e3450b3f5 Make Mods readonly 2021-10-04 20:20:24 +09:00
smoogipoo
031c5a441e Merge branch 'master' into realtime-pp-display 2021-10-04 20:19:37 +09:00
Dan Balasescu
4bd1083388
Merge pull request #14903 from peppy/importer-returns-live
Add `ILive<T>` and use as return type of `Import` methods
2021-10-04 20:16:32 +09:00
smoogipoo
4871db2f86 Merge branch 'master' into importer-returns-live 2021-10-04 19:42:36 +09:00
Dean Herbert
853cf6feaa Rename last remaining BeatmapInfo Beatmap usage 2021-10-04 17:35:53 +09:00
Dean Herbert
916342c837 Merge branch 'master' into importer-returns-live 2021-10-04 16:24:26 +09:00
smoogipoo
69c2b7dc59 Merge branch 'master' into rename-beatmap-info-beatmap-fields 2021-10-04 16:03:22 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Bartłomiej Dach
017756cbca
Use Torus alternates on online play screens as per design 2021-10-04 00:26:41 +02:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Dean Herbert
973c31132b Rename BeatmapInfo variables which were named beatmap for clarity 2021-10-02 12:45:34 +09:00
Dean Herbert
7e009f6168 Add full xmldoc 2021-10-02 02:31:41 +09:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
Dean Herbert
05ca3aec4f Rename GameplayState to SpectatorGameplayState 2021-10-02 02:10:11 +09:00
smoogipoo
0ee148b53f Extra guard against no attributes 2021-10-01 21:31:26 +09:00
smoogipoo
a1f880a36a Split classes 2021-10-01 21:00:39 +09:00
smoogipoo
d0081908c5 Make Score internal 2021-10-01 20:52:48 +09:00
smoogipoo
5820a71652 Fix mania difficulty calculator crashing 2021-10-01 19:57:45 +09:00
Dean Herbert
59bd13c154 Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-01 17:47:00 +09:00
Dean Herbert
ac471a0ec1 Merge branch 'no-more-difficulty-control-points-info' into slider-timeline-velcotiy-adjust-v2 2021-10-01 17:46:58 +09:00
Dean Herbert
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
smoogipoo
36be041846 Merge branch 'master' into realtime-pp-display 2021-10-01 13:28:38 +09:00
Dean Herbert
a2e61883e3 Initial push to use ILive in import process 2021-09-30 22:55:25 +09:00
Dean Herbert
3e3b9bc963 Split out IModelDownloader and also split apart ScoreManager 2021-09-30 18:25:20 +09:00
smoogipoo
4d8418e072 Fix possible nullrefs 2021-09-30 17:54:56 +09:00
smoogipoo
d2a8f35b4c Update styling 2021-09-30 17:54:52 +09:00
smoogipoo
84bddf0885 Initial PP counter implementation 2021-09-30 17:00:24 +09:00
smoogipoo
816018edb7 Move hosted by text into nullcheck 2021-09-30 12:04:30 +09:00
smoogipoo
202a602d2f Change default status to "ready to play" 2021-09-30 12:03:44 +09:00
smoogipoo
ea30445efc Remove verbatim string 2021-09-30 12:03:34 +09:00
smoogipoo
619a907c47 Fix zero height grid 2021-09-30 12:01:26 +09:00
smoogipoo
56b3c8aa9a Remove forgotten text 2021-09-30 11:52:14 +09:00
smoogipoo
c83dd7d2b6 Merge OnlinePlayComposite and RoomSubScreenComposite 2021-09-29 20:55:20 +09:00
Jamie Taylor
4d91204faf
Pause Editor sample playback while popup dialog is shown 2021-09-29 20:46:41 +09:00
smoogipoo
c9c2d20544 Limit max size 2021-09-29 20:44:38 +09:00
smoogipoo
67d847fbd3 Add room status text to DrawableRoom 2021-09-29 20:24:49 +09:00
smoogipoo
5f921c7836 Change SelectedItem to show the last item by default 2021-09-29 20:24:32 +09:00
smoogipoo
d89577b2e7 Add host to DrawableRoomParticipantsList 2021-09-29 19:34:40 +09:00
smoogipoo
73ee82ee2b Rename RecentParticipantsList -> DrawableRoomParticipantsList 2021-09-29 19:15:58 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Dean Herbert
46bafb6252 Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-28 13:53:56 +09:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection 2021-09-27 20:54:29 +02:00
Dean Herbert
df85092426 Resolve inner items early in process and rename variable 2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting 2021-09-27 14:12:09 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection 2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection 2021-09-26 19:27:47 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available 2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one 2021-09-26 15:48:56 +02:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dan Balasescu
ffdaf23329
Merge pull request #14814 from peppy/fix-key-counter-masking
Fix `KeyCounterDisplay` potentially getting stuck invisible due to autosize masking
2021-09-21 16:21:38 +09:00
Bartłomiej Dach
761548e533
Merge branch 'master' into 14470-ur-not-updating 2021-09-20 22:07:33 +02:00
sh0ckR6
fb416c79e9
Fully revert Player 2021-09-20 15:01:03 -04:00
Dean Herbert
a3464c98a7 Fix KeyCounterDisplay potentially getting stuck invisible due to autosize masking
Closes #14793.
2021-09-20 23:52:01 +09:00
sh0ckR6
9a1db04920
Resolve GameplayClockContainer instead of Player 2021-09-20 10:28:58 -04:00
sh0ckR6
36a20ab0b3
Resolve failed test compilation 2021-09-20 10:26:07 -04:00
sh0ckR6
10fe2382b0
Address most issues 2021-09-20 10:07:42 -04:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable 2021-09-19 20:26:02 +02:00
Bartłomiej Dach
56e80a0706
Add rectangular position snap grid 2021-09-19 18:07:19 +02:00
sh0ckR6
04715a5471
Add null-check when invoking OnSeek 2021-09-18 12:20:36 -04:00
sh0ckR6
f6e279baa1
Add xmldoc to HitErrorMeter.Clear
Explains how the method is called and what inheritors should do when implementing it.
2021-09-18 12:18:11 -04:00
sh0ckR6
12cc16c598
Remove unused property in SongProgress 2021-09-18 12:05:06 -04:00
sh0ckR6
b2b3108afa
Resolve addressed issues
+ Stopped using testing methods in non-testing classes
+ Resolve Player and add OnSeek event
+ Take bindings away from BarHitErrorMeter
+ Add support for ColourHitErrorMeter
2021-09-17 16:19:41 -04:00
Jamie Taylor
f868feae44
Remove unnecessary Schedule 2021-09-17 21:12:39 +09:00
Jamie Taylor
9485323a13
Add audio feedback for incorrect MP room password 2021-09-17 20:52:13 +09:00
Dan Balasescu
a591fffdbd
Merge pull request #14782 from peppy/refocus-textbox-on-failed-password
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:59:09 +09:00
Dean Herbert
027912d4f6 Refocus the multiplayer password entry textbox on failed join 2021-09-17 18:25:25 +09:00
Dean Herbert
1c8e17cf11 Fix the default background parallax being set incorrectly when no screen is present 2021-09-17 18:14:39 +09:00
Dean Herbert
5f27f1c099 Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
Bit of an unfortunate one. Because we are applying the pitch adjustment
to the lowest level (`Track`), it's hard to filter out in parent clock
calculations.

Tried a few solutions but this feels the best. Note that we can't just
undo the `pauseFreqAdjust` adjustment as it will div-by-zero.

Closes https://github.com/ppy/osu/issues/14773.
2021-09-17 15:43:38 +09:00
Dean Herbert
f524e913e1 Move AllowTrackAdjustments specification to RoomSubScreen 2021-09-17 13:24:01 +09:00
Dean Herbert
cd4ba71a6b Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj"
This reverts commit 06ff4838fb, reversing
changes made to 5453ea0ce9.
2021-09-17 13:22:39 +09:00
Joseph Madamba
55feb47e61 Disallow track adjustments on playlists / multi lounge 2021-09-16 20:17:21 -07:00
smoogipoo
e8dea0138c Fix one more issue 2021-09-16 18:34:13 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
Dean Herbert
3495fae519 Handle potential for OnResuming call without an OnSuspending first 2021-09-16 16:31:41 +09:00
Dean Herbert
b58415fe19 Make suspend stored state nullable to ensure we don't break it 2021-09-16 16:12:14 +09:00
Dean Herbert
fa693bb8a8 Move MusicController adjustment set to inside OsuScreen itself (and result nullable) 2021-09-16 16:08:09 +09:00
AbstractQbit
318f0941ca Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen 2021-09-15 21:25:39 +03:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-15 22:26:13 +09:00
AbstractQbit
f0439ef50b Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect 2021-09-15 13:12:57 +03:00
Dean Herbert
8acfefed1b
Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter
Fix incorrect beatmap count and SR range in multi lounge
2021-09-15 18:51:52 +09:00
AbstractQbit
1181317c72 Fix issues found by code quality ci 2021-09-15 12:01:56 +03:00
smoogipoo
f54d554d30 Extract removal to method 2021-09-15 17:03:28 +09:00
AbstractQbit
48cf98ef93 Rephrase null meaning in IOsuScreen.AllowTrackAdjustments
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-09-15 11:00:49 +03:00
AbstractQbit
b87af3dd68 Move the inherited AllowTrackAdjustments into OsuScreen 2021-09-15 10:55:16 +03:00
Dean Herbert
1ba716d9f1
Merge pull request #14737 from bdach/editor-difficulty-switch-shared-state
Preserve current time and clipboard contents when switching between difficulties
2021-09-15 12:38:56 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Dean Herbert
13f88cbc4e Fix EditorClock retaining a reference to potentially outdated ControlPointInfo 2021-09-14 23:56:57 +09:00
AbstractQbit
b9193aae6d Make IOsuScreen.AllowTrackAdjustments nullable
Allows for inheriting value from the previous screen if undefined
2021-09-14 17:37:57 +03:00
Dean Herbert
57f8ccca16 Remove nullability from EditorState properties
Also update the xmldoc to not be specific to difficulty switching
2021-09-14 23:36:28 +09:00
Dean Herbert
f8bdca542d Make restoring state a public call on Editor 2021-09-14 23:36:17 +09:00
Dean Herbert
2a894e7a3f Make EditorLoader state private 2021-09-14 23:26:02 +09:00
Dean Herbert
563bf92529 Also update the full object on sample changes to make them apply immediately 2021-09-14 19:21:23 +09:00
Dean Herbert
d825da3983 Add note about a better way to adjust velocity 2021-09-14 18:54:29 +09:00
Dean Herbert
e4dd59aee2 Add popovers to adjust SV and samples from the timeline 2021-09-14 18:51:22 +09:00
Dean Herbert
9d17f84681 Adjust timeline height to account for less global control points 2021-09-14 18:51:11 +09:00
Dean Herbert
9551e77553 Remove difficulty and sample sections from timing screen 2021-09-14 18:51:11 +09:00
Dean Herbert
87cfcf706e Add ability to change slider velocity with shift-drag 2021-09-14 18:26:17 +09:00
Dean Herbert
b19dc5e41f Remove all legacy ControlPoints when entering the editor 2021-09-14 18:26:16 +09:00
Dean Herbert
6015b5037a Display difficulty and sample control points associated with hitobjects 2021-09-14 18:26:16 +09:00
smoogipoo
a775915338 Fix incorrect beatmap count and SR range in multi lounge 2021-09-14 18:20:28 +09:00
Dean Herbert
5058f28504 Remove breaking padding 2021-09-14 14:52:50 +09:00
Dean Herbert
8865e3cab8 Add back shake and tweak transform of text 2021-09-14 14:44:32 +09:00
Dean Herbert
7bd749d0eb Remove weird shaking 2021-09-14 14:19:55 +09:00
Dean Herbert
e3c56f9ebd Show error message in popover 2021-09-14 14:14:06 +09:00
Dean Herbert
eaac2bad3d Fix incorrect child margin specifications 2021-09-14 13:49:02 +09:00
Bartłomiej Dach
35ee889e5b
Restore clipboard content after difficulty switch 2021-09-13 21:04:27 +02:00
Bartłomiej Dach
79d0f4835e
Add failing tests for preserving clipboard content 2021-09-13 21:03:30 +02:00
Bartłomiej Dach
3fc72271f1
Restore editor clock time after difficulty switch 2021-09-13 20:59:31 +02:00
AbstractQbit
3c75094f43 Move BarHitErrorMeter's icon reorintation to Update() 2021-09-13 19:41:55 +03:00
AbstractQbit
7267602b95 Fix icon orientation for horizontal bar hit error meter 2021-09-13 17:14:39 +03:00
Dan Balasescu
f6c4bbe2c9
Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults
Add missing screen level mod application settings for some screens
2021-09-13 15:22:22 +09:00
Dean Herbert
f9c82a9098
Merge pull request #14676 from nekodex/lobby-team-swap
Add sound for multiplayer team swaps
2021-09-13 15:01:58 +09:00
Dean Herbert
caf7ef6519 Add missing screen level mod application settings for some screens
Closes #7480. But based on discussion in there this solution may change.
2021-09-13 15:00:34 +09:00
Dean Herbert
7fe0eefb78 Add inline comment regarding team switch sample logic
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
Dean Herbert
65fdceee79
Merge branch 'master' into editor-test-scenes-through-loader 2021-09-13 14:02:55 +09:00
sh0ckR6
447001931c
Resolve LoungeSubScreen from PasswordEntryPopover
This is preferred over passing down the already-resolved LoungeSubScreen
2021-09-12 14:36:11 -04:00
Bartłomiej Dach
345cde251d
Add "samples match playback rate" to editor setup screen 2021-09-12 16:54:17 +02:00
Bartłomiej Dach
22fa9a303e
Expose test helper for switching between difficulties 2021-09-12 13:55:48 +02:00
Bartłomiej Dach
8357efc74f
Make EditorTestScene go through EditorLoader 2021-09-12 13:26:04 +02:00
sh0ckR6
e018071be4
Remove OnShakeFinish event 2021-09-11 19:50:41 -04:00
sh0ckR6
6cdc842452
Remove placeholder text response
Weird UX, doesn't feel right compared to the rest of lazer
2021-09-11 17:42:49 -04:00
sh0ckR6
b8a6925175
Use already-resolved LoungeSubScreen instead of nested delegates 2021-09-11 17:41:07 -04:00
Dean Herbert
94702ee7e3 Fix triangles intro attempting to restart track after it is disposed 2021-09-10 18:23:00 +09:00
Dan Balasescu
1d9ad9478e
Merge pull request #14683 from peppy/use-decoupled-clock-triangles-intro
Use a decoupled clock for triangles intro to avoid startup freezes on broken audio device
2021-09-10 13:15:58 +09:00
sh0ckR6
bde092f816
Clear UR bar display on seek with mouse 2021-09-09 20:08:16 -04:00
sh0ckR6
bf0150bab4
Clear UR bar display on keyboard input 2021-09-09 16:21:51 -04:00
Dean Herbert
6c18df24ec Change how UsingThemedIntro is set to improve clarity 2021-09-09 22:04:16 +09:00
Dean Herbert
99b6f0352c Always start decoupled clock regardless of track source 2021-09-09 22:04:00 +09:00
Dean Herbert
199f5235a3
Merge branch 'master' into fix-score-panel-list-keyboard-nav 2021-09-09 12:12:16 +09:00
Dean Herbert
ba99a808af Use a decoupled clock for triangles intro to avoid startup freezes on broken audio device 2021-09-09 01:21:19 +09:00
Dean Herbert
6fc46792d3 Fix test regressions 2021-09-09 00:39:54 +09:00
Dean Herbert
136573982c Add fade in and fix incorrect wrapper bounds 2021-09-08 20:52:14 +09:00
Dean Herbert
7941240a00 Revert "Load DrawableLoungRooms asynchronously"
This reverts commit 0b55bb6913fbf05ebb8ecadfe711084d6797efe0.
2021-09-08 20:52:14 +09:00
Dean Herbert
3e41d8b32e Reduce initial fade transforms 2021-09-08 20:52:14 +09:00
Dean Herbert
bebb9d7e67 Wrap main content of DrawableRoom 2021-09-08 20:52:14 +09:00
Dean Herbert
037b9cfb59 Load DrawableLoungRooms asynchronously 2021-09-08 20:52:14 +09:00
Jamie Taylor
217ca754ae
Add sound for team swaps 2021-09-08 13:45:05 +09:00
sh0ckR6
b1f91596a7
Give user feedback on password attempt fail
Shake the popover
Set the input box's color to red and set the placeholder text to "incorrect password"
2021-09-07 20:05:24 -04:00
sh0ckR6
b8a1ebb786
Hide Popover after failed password attempt
Instead of throwing an error, just close the popover and let the user continue
2021-09-07 16:54:21 -04:00
Bartłomiej Dach
8cc444df5f
Fix incorrect keyboard navigation order in score panel list 2021-09-07 21:14:38 +02:00
Dean Herbert
fa62c846c5
Merge pull request #14603 from smoogipoo/score-ordering
Fix scores not being ordered correctly on leaderboards
2021-09-07 19:18:37 +09:00
Dean Herbert
1aa95de530 Merge branch 'master' into score-ordering 2021-09-07 17:45:38 +09:00
smoogipoo
4658577b1d Factor in total score calculation time in results screen load 2021-09-07 15:19:09 +09:00
Dean Herbert
93da531d13 Improve code around background screen handling to read better 2021-09-07 14:35:33 +09:00
Dean Herbert
9edd010b1d Fix unnecessary background screen transition 2021-09-07 14:34:54 +09:00
Dean Herbert
7921ad4516 Add loading spinner in case load takes longer than expected 2021-09-07 14:34:47 +09:00
Dean Herbert
ddaa95a1ca Fix pushEditor function running twice on returning to loader 2021-09-07 14:34:18 +09:00
Dean Herbert
59aa4dabfd Improve code around background screen handling to read better 2021-09-07 14:33:58 +09:00
smoogipoo
c9325cc419 Fix results screen test scene 2021-09-07 14:15:23 +09:00
Bartłomiej Dach
5b9f37702b
Remove unnecessary delay before pushing editor from loader 2021-09-06 21:32:23 +02:00
Bartłomiej Dach
2d59008f52
Move screen management logic to EditorLoader 2021-09-06 21:30:50 +02:00
Bartłomiej Dach
bd7d6dd35d
Rename method 2021-09-06 21:27:17 +02:00
Dean Herbert
ce197b6322 Fix missing attribute text (and give slightly more space for "10.00x" cases 2021-09-06 21:40:30 +09:00
Dean Herbert
3c7a34bdbd Move mania-specific conversion to converter 2021-09-06 21:06:13 +09:00
Dean Herbert
52b6b05883 Update terminology in timing screen for now 2021-09-06 21:06:13 +09:00
Dean Herbert
0500cd578a Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-06 21:06:12 +09:00
smoogipoo
20100b8894 Fix a few test failures 2021-09-06 20:20:52 +09:00
smoogipoo
401d38fc05 Fix possible nullref 2021-09-06 19:07:37 +09:00
Bartłomiej Dach
d6a47fd99c
Sort difficulties by ruleset and star rating in menu 2021-09-05 21:48:11 +02:00
Bartłomiej Dach
7012a1d934
Fix issues with main menu -> editor loader transition 2021-09-05 21:48:11 +02:00
Bartłomiej Dach
382269b362
Test staying on same difficulty due to unsaved changes 2021-09-05 21:48:10 +02:00
Bartłomiej Dach
c72523bc14
Add basic test for difficulty switching 2021-09-05 21:48:10 +02:00
Bartłomiej Dach
a9403b65b3
Eliminate dependency on OsuGame 2021-09-05 21:48:10 +02:00
Bartłomiej Dach
c397cc2027
Restructure proof of concept 2021-09-05 21:48:09 +02:00
Bartłomiej Dach
fe2520c599
Add intermediary screen to avoid going back to menus 2021-09-05 21:48:09 +02:00
Bartłomiej Dach
7befd030df
Minimal working example of switching difficulties 2021-09-05 21:48:09 +02:00
Bartłomiej Dach
90f0b6874f
Highlight current difficulty in switcher 2021-09-05 21:48:08 +02:00
Bartłomiej Dach
e8fb5d2e66
Add non-functional difficulty switcher to menu 2021-09-05 21:48:08 +02:00
Dean Herbert
e0ee2a5533 Change section title to read better 2021-09-05 13:34:57 +09:00
Dean Herbert
25420af078 Rename method to drop redundant ruleset suffix 2021-09-05 13:34:23 +09:00
Bartłomiej Dach
1a90fb1ef3
Fix cached property being assigned twice 2021-09-04 19:52:42 +02:00
Dean Herbert
f42131ff89 Add back editor functionality for now 2021-09-03 19:08:23 +09:00
Dean Herbert
d4e5a612ea Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time
This allows fetching the correct `DifficultyControlPoint` from the
hitobject. Nothing more.
2021-09-03 17:11:12 +09:00
Dean Herbert
a3d9ab1e2e Move approach rate to EffectControlPoint 2021-09-03 16:58:16 +09:00
Dean Herbert
071c56e90b Update usages of DifficultyPointAt 2021-09-03 16:58:16 +09:00
Bartłomiej Dach
ce1912781e
Add extension point for ruleset-specific beatmap setup sections 2021-09-02 23:29:14 +02:00
Dean Herbert
7688ea7057 Merge branch 'master' into score-ordering 2021-09-02 19:19:52 +09:00
Dan Balasescu
6c649b7bbe
Merge branch 'master' into no-more-sample-control-points-info 2021-09-02 18:09:05 +09:00
Dean Herbert
f223be0760
Merge branch 'master' into score-ordering 2021-09-02 14:45:59 +09:00
Dan Balasescu
aadef41182
Merge pull request #14601 from peppy/fix-editor-setup-screen-pixel-leakage
Fix pixels poking out of the top edge of editor setup screen
2021-09-02 14:03:37 +09:00
smoogipoo
f7c1177cc9 Fix ScorePanelList nullref when scores are added too soon 2021-09-01 20:35:06 +09:00
Dean Herbert
ef64c05af8
Merge pull request #14533 from frenzibyte/move-incompatibility-icon
Move mod incompatibility logic to "local player" mod select overlays
2021-09-01 18:12:27 +09:00
Dean Herbert
9e21f5a59c Rename LocalPlayer to User in mod select prefixes 2021-09-01 17:22:52 +09:00
Dean Herbert
0319177c5c Fix pixels poking out of the top edge of editor setup screen 2021-09-01 16:46:19 +09:00
smoogipoo
88fc53200e Refactor 2021-09-01 15:41:52 +09:00
Dean Herbert
edf29e405b
Merge pull request #14581 from bdach/setup-screen-countdown-settings
Add countdown settings to setup screen
2021-09-01 15:35:46 +09:00
smoogipoo
2de076a74b Merge branch 'adjust-classic-scoring' into score-ordering 2021-09-01 15:06:55 +09:00
Bartłomiej Dach
5dc938cc9f
Update tests to match expectations 2021-08-31 22:41:47 +02:00
Bartłomiej Dach
04773b51bb
Remove countdown toggle transition for now
Tricky to get right and the design isn't final as is anyway, so leaving
*something* functioning as a best-effort for now.
2021-08-31 22:41:40 +02:00
smoogipoo
fee94236de Fix update-thread pauses 2021-08-31 21:36:31 +09:00
smoogipoo
bfcadcc4ac Revert some changes 2021-08-31 19:18:01 +09:00
Dean Herbert
ce0d7cce2d Merge branch 'remove-ijsonserializable' into no-more-sample-control-points-info 2021-08-31 14:40:54 +09:00
Dean Herbert
c25ab6835c Remove IJsonSerializable interface
Was pretty pointless and made it hard to use the custom serialisation
terms arbitrarily in tests.
2021-08-31 14:39:20 +09:00
Bartłomiej Dach
ddf9d2aa6c
Add test coverage 2021-08-30 22:55:58 +02:00
Bartłomiej Dach
eec9f6d191
Add countdown settings to design section 2021-08-30 22:51:41 +02:00
Salman Ahmed
6154642075
Merge branch 'master' into local-popover-containers 2021-08-30 15:44:29 +03:00
Dan Balasescu
b95da3ca27
Merge pull request #14576 from peppy/update-framework
Update framework
2021-08-30 21:09:58 +09:00
smoogipoo
caa797cbf4 Attempt to reorder score panel list 2021-08-30 19:58:35 +09:00
smoogipoo
e19d81c88c Fix potential incorrect ordering 2021-08-30 19:41:44 +09:00
smoogipoo
4ebb11472d Update Leaderboard to reorder scores based on scoring mode 2021-08-30 19:34:34 +09:00
Henry Lin
8137eee527
Reuse value to save enum name
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-08-30 18:05:47 +08:00
Henry Lin
04bf667d0d Parse partially typed enum names in filter query 2021-08-30 17:49:18 +08:00
Dean Herbert
ccacf56dd8 Move to legacy namespace 2021-08-30 17:14:53 +09:00
Dean Herbert
7257aae7f2 Move samples to LegacyControlPointInfo 2021-08-30 17:14:53 +09:00
Dean Herbert
f64efdc4a9 Merge branch 'update-extension-usages' into update-framework 2021-08-30 16:00:09 +09:00
Dan Balasescu
7be825f470
Merge pull request #14488 from frenzibyte/multi-spectator-player-leaving
Gray out and stop player instances who quit during multi-spectator sessions
2021-08-30 12:04:19 +09:00
Salman Ahmed
e374ef163d Update localisable formattable extensions usages inline with framework change 2021-08-29 15:00:28 +03:00
Bartłomiej Dach
fcc3e57d5d
Move overlay colour provider up to editor screen 2021-08-28 20:05:58 +02:00
Bartłomiej Dach
e94d96f250
Add local popover container to editor screens 2021-08-28 20:05:58 +02:00
Bartłomiej Dach
7457480b50
Add local popover container to lounge subscreen 2021-08-28 20:05:58 +02:00
Salman Ahmed
378734a7f8 Separate solo spectator player and "exit on restart" logic to own class 2021-08-27 13:24:37 +03:00
Dean Herbert
2b06dacd0e Change debounce back to using scheduler
Should better allow for adjusting in the future, as well.
2021-08-27 18:57:19 +09:00
Dean Herbert
33aa48bcf6 Merge branch 'master' into lobby-sounds 2021-08-27 18:46:12 +09:00
Bartłomiej Dach
d71dff4340
Merge branch 'master' into skip-overlay-optimisations 2021-08-26 22:38:17 +02:00
Jamie Taylor
56baecdde4
Add missing interaction sfx to MatchTypePicker 2021-08-26 15:30:20 +09:00
Jamie Taylor
e341f471b0
Add lobby sfx for join/leave/kick/ready/unready events 2021-08-26 15:29:22 +09:00
Dean Herbert
e633b2716d Fix regression in outro skip handling logic 2021-08-26 13:58:45 +09:00
Dean Herbert
b1a261c902 Avoid using scheduled delegates at all for skip overload input handling 2021-08-26 12:25:37 +09:00
Dean Herbert
956e3c554b Avoid skip overlay attempting to show when it is already invalid 2021-08-26 12:25:37 +09:00
Salman Ahmed
b4d6495f99 Fix editor skin providing container not providing playable beatmap 2021-08-25 17:52:36 +03:00
Salman Ahmed
3ad0b529fb Make EditorScreen inherit from VisibilityContainer rather than unsafe transforms 2021-08-25 17:14:52 +03:00
Salman Ahmed
196c74fce8 Gray out and remove player clock when users stop playing 2021-08-25 11:31:02 +03:00
Salman Ahmed
599145b46a Stop clocks when removing them from sync manager 2021-08-25 11:31:02 +03:00
Dean Herbert
e1ab3434ed Add ability to handle user join/leave/kick events in MultiplayerComposites 2021-08-25 14:37:14 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 18:50:55 +02:00
Dean Herbert
08f757a584
Merge pull request #14474 from smoogipoo/fix-multi-crash
Fix crash when entering multiplayer gameplay
2021-08-24 16:20:18 +09:00
smoogipoo
16ddbcd208 Don't bind to RoomId where it's expected to be constant 2021-08-24 14:25:40 +09:00
Salman Ahmed
847726547a Move mod value change callback inside wedge info text component 2021-08-24 07:53:49 +03:00
smoogipoo
de0de451fe Refactor to remove resolved dependency 2021-08-24 13:29:19 +09:00
smoogipoo
df170afbc4 Fix multiplayer crashing when entering gameplay 2021-08-24 13:22:06 +09:00
smoogipoo
956c1cc216 Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 12:33:34 +09:00
Bartłomiej Dach
ccf337bdc2
Merge branch 'master' into editor-setup-file-selector-popovers 2021-08-23 18:28:44 +02:00
Salman Ahmed
bd42d7aada Hide popover on file selection 2021-08-23 18:01:01 +03:00
Dean Herbert
34b51100ff
Merge pull request #14448 from bdach/basic-design-settings
Add basic design settings to editor setup screen
2021-08-23 18:19:58 +09:00
Dean Herbert
c2c9a93e2c Show editor file choosers in a popover rather than inline
Supersedes and closes #14370.
Closes #14367.
2021-08-23 18:12:36 +09:00
Dean Herbert
2f6b95da39 Add descriptions for the remaining settings 2021-08-23 17:41:03 +09:00
Dean Herbert
1de84e1c98
Change description to include mention of video
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-23 17:34:19 +09:00
Dean Herbert
eaa4d479ac
Merge pull request #14408 from smoogipoo/remove-current-room
Remove the global "selected room" from online screens
2021-08-23 17:29:31 +09:00
Dean Herbert
99bb3032a5 Move gradient to be part of the background for now 2021-08-23 15:27:32 +09:00
Dean Herbert
58fb0c042b Remove background scale altogether
I'm not sure why this is required. Seems like something which was meant
to exist to handle parallax, but that is already handled elsewhere now.
2021-08-23 14:34:27 +09:00
smoogipoo
4f3a5fbad5 Fix test failure 2021-08-23 14:29:15 +09:00
Dan Balasescu
ead1b47e0e
Merge branch 'master' into localise-beatmap-set-overlay 2021-08-23 13:22:52 +09:00
Bartłomiej Dach
2e80e2be51
Reword epilepsy warning description text 2021-08-22 21:47:37 +02:00
Bartłomiej Dach
9538a32b5e
Explicitly update beatmap info wedge on mod change
This used to already be the case prior to b419ea7, but in a very
roundabout way. Changes to the value of the star difficulty bindable -
including indirect changes via the set of active mods changing - would
trigger the wedge display to regenerate and load asynchronously.

b419ea7 accidentally broke this by moving down the bindable retrieval to
a lower level, at which point `WedgeInfoText` would only receive the set
of mods selected at the time at which a given beatmap was selected, and
not receive any further updates, breaking the BPM display updating in
real time (as `WedgeInfoText` could not be aware that rate-changing mods
were even in effect).

To resolve, explicitly reload the wedge's contents on mod changes.
2021-08-22 19:16:46 +02:00
Bartłomiej Dach
e4a8f72167
Add failing test case 2021-08-22 19:16:43 +02:00
Bartłomiej Dach
9816af688e
Add basic design settings to setup screen 2021-08-22 17:43:20 +02:00
Salman Ahmed
9b1720bd6c Merge branch 'master' into localise-beatmap-set-overlay 2021-08-22 10:53:31 +03:00
Nathan Alo
2877b43824 split multiplayer and playlist activity 2021-08-22 09:54:07 +08:00
Dean Herbert
15d443f6b7 Use the UI mouse cursor when hovering gameplay chat in an interactive state 2021-08-21 14:44:54 +09:00
smoogipoo
f85d3665d8 Cleanups 2021-08-20 21:45:24 +09:00
smoogipoo
5192ee3b57 Fix initial display in room background 2021-08-20 21:40:35 +09:00
smoogipoo
5c8ca32ea4 Simplify lounge implementation 2021-08-20 21:33:21 +09:00
smoogipoo
b1a732b9b7 Remove selectedRoom from OnlinePlayScreen 2021-08-20 21:28:48 +09:00
smoogipoo
ceb07826d7 Merge branch 'master' into remove-current-room 2021-08-20 21:10:41 +09:00
smoogipoo
9458cd5a31 Make DrawableMatchRoom background load instantly 2021-08-20 21:07:51 +09:00
smoogipoo
b190020c4b Block lounge background screen from exiting 2021-08-20 21:02:25 +09:00
Dean Herbert
77149044a5 Allow intro screen to retrieve beatmap even if rulesets is not loaded 2021-08-20 19:43:48 +09:00
smoogipoo
d304e283e4 Don't deselect online room when joined 2021-08-20 18:14:59 +09:00
smoogipoo
c22c6f3a49 Initial room background implementation 2021-08-20 18:14:12 +09:00
smoogipoo
258ba4674c Fix background overflows 2021-08-20 17:50:49 +09:00
smoogipoo
3d96da84e6 Set a default background 2021-08-20 17:05:46 +09:00
smoogipoo
8524937c82 Move screenstack up a level 2021-08-20 17:02:55 +09:00
smoogipoo
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Dean Herbert
98357d51da
Merge pull request #14323 from minetoblend/editor-seek
Prevent seeking before mp3 start time while editor is playing
2021-08-20 13:28:20 +09:00
Dan Balasescu
c95bf735fe
Merge branch 'master' into multiplayer-chat 2021-08-20 11:54:42 +09:00
Dean Herbert
e25592f325
Merge branch 'master' into fix-lounge-loading 2021-08-19 20:01:47 +09:00
Dean Herbert
2b0f2a6db9
Merge pull request #14355 from frenzibyte/mod-settings-difficulty-cache
Update star difficulty bindables on mod settings change
2021-08-19 20:00:48 +09:00
Dean Herbert
b09105e5a7
Merge pull request #14381 from smoogipoo/match-subscreen-redesign
Update layout of multiplayer room screens
2021-08-19 19:36:21 +09:00
Dean Herbert
a65cd36a5f Move some constants to consts 2021-08-19 19:19:46 +09:00
smoogipoo
44e157447c Initial rework of backgrounds 2021-08-19 19:10:54 +09:00
Dean Herbert
8fce5911a9 Adjust spacing and padding of footer buttons 2021-08-19 19:08:46 +09:00
Dean Herbert
16aecfe934 Start free mod selection area hidden on screen display 2021-08-19 19:02:54 +09:00
Dean Herbert
be77498044 Move chat to right column in multiplayer match screen 2021-08-19 19:02:31 +09:00
Dean Herbert
675e2e34ba Add padding between beatmap panel and edit button 2021-08-19 19:02:05 +09:00
Dean Herbert
4afc808ffc Remove horizontal transitions for now
They look bad with the current toolbar implementation. We can probably
add them back once the toolbar is moved to the lounge.
2021-08-19 18:29:59 +09:00
smoogipoo
023f3fb70e Use BackgroundScreen for multiplayer backgrounds 2021-08-19 18:19:31 +09:00
smoogipoo
493f47787b Disable condition for the time being 2021-08-19 18:18:42 +09:00
Dean Herbert
4d1582d721 Play settings hide animation if visible when exiting RoomSubScreen 2021-08-19 18:14:45 +09:00
smoogipoo
6b6d52c23b Add dependency container to RoomSubScreen 2021-08-19 16:53:07 +09:00
smoogipoo
4d1897c6b4 Remove unnecessary resolve into ListingPollingComponent 2021-08-19 16:52:54 +09:00
smoogipoo
00be7f4cca Make RoomsContainer/DrawableRoom not resolve via DI 2021-08-19 16:52:54 +09:00
smoogipoo
3a1154c00e Pass room into SelectionPollingComponent 2021-08-19 16:41:21 +09:00
smoogipoo
c31af96f1d Pass room into RoomSettingsOverlay 2021-08-19 16:41:21 +09:00
smoogipoo
1fd746524d Remove realtime room category, fix end-date showing for realtime 2021-08-19 16:09:28 +09:00
smoogipoo
6469eaa427 Fix background not updated in room 2021-08-19 15:52:51 +09:00
Salman Ahmed
6bfae25cda Apply 5px vertical spacing on fill flow
Regressed, was margin { bottom = 5f } from the star rating display
creation method, which I've partly inlined.
2021-08-19 08:30:29 +03:00
Dean Herbert
6d00ea3375 Allow toggling focus via binding 2021-08-19 14:19:59 +09:00
Salman Ahmed
25e6317e7f Use animated star display in beatmap info wedge and synchronise bar 2021-08-19 07:18:02 +03:00
Salman Ahmed
102320f8ae Merge branch 'master' into mod-settings-difficulty-cache 2021-08-19 06:35:13 +03:00
Salman Ahmed
b984780d6a Merge branch 'master' into fix-lounge-loading 2021-08-19 06:26:15 +03:00
Salman Ahmed
0e2f3dff4d Fix rooms scroll container not masking properly due to padding 2021-08-19 05:09:49 +03:00
Salman Ahmed
ffbe8ddfa4 Refactor lounge sub screen layout for better loading screen appearance 2021-08-19 04:23:12 +03:00
Bartłomiej Dach
07951fe18c
Merge branch 'master' into limit-match-settings-textbox 2021-08-18 21:17:16 +02:00
Davran Dilshat
43cbd10a38 change limit to be on actual usage site 2021-08-18 18:30:50 +01:00
Davran Dilshat
61675eefe0 Add length limit to match settings textboxes 2021-08-18 17:36:57 +01:00
smoogipoo
d40023bcc1 Hide border by default 2021-08-18 21:09:34 +09:00
smoogipoo
e9221f0126 Cleanup unnecessary implementation 2021-08-18 21:00:11 +09:00
smoogipoo
eadf02933a Split lounge-specific implementation from DrawableRoom 2021-08-18 20:56:44 +09:00
smoogipoo
63af67f61b Cleanup around footers 2021-08-18 20:25:48 +09:00
Salman Ahmed
8172ffc401 Fix lounge sub screen loading layer displaying in the background 2021-08-18 13:12:58 +03:00
Dean Herbert
1faf789f0e Allow expanding chat using key binding even when it is hidden 2021-08-18 18:25:21 +09:00
Dean Herbert
365c1bccc6 Fix multiplayer channel being unintentionally left after gameplay session 2021-08-18 18:24:20 +09:00
Salman Ahmed
5e91ec73e3 Handle star rating range display sizing 2021-08-18 11:36:27 +03:00
Dean Herbert
2099298444 Disallow clicking on chat textbox during gameplay 2021-08-18 17:30:50 +09:00
smoogipoo
9220d17202 Adjust paddings/spacings 2021-08-18 17:28:20 +09:00
Dean Herbert
9d2664cbb1 Merge branch 'master' into star-rating-display-v2 2021-08-18 17:22:33 +09:00
smoogipoo
6dc96fdb83 Disable edit button in playlists 2021-08-18 16:56:42 +09:00
smoogipoo
87a5922f0e Remove participants from playlists screen 2021-08-18 16:26:45 +09:00
smoogipoo
66e11fe75e Initial integration of playlists with the new structure 2021-08-18 16:09:15 +09:00
smoogipoo
568f1fd345 Fix initial RoomId state not being handled correctly 2021-08-18 16:09:00 +09:00
smoogipoo
90a1be2e61 Move paddings up one level 2021-08-18 15:54:33 +09:00
smoogipoo
744b6749d1 Resolve room settings layout issues 2021-08-18 15:29:01 +09:00
smoogipoo
228ad98b39 Remove extra corner radius on DrawableRoom 2021-08-18 15:27:23 +09:00
smoogipoo
f3bc9c3e45 Merge branch 'master' into match-subscreen-redesign 2021-08-18 15:19:29 +09:00
smoogipoo
c5268c9a99 Simplify by reusing same room panel 2021-08-18 15:19:24 +09:00
smoogipoo
704af94d39 Add edit button to room panel 2021-08-18 15:13:10 +09:00
smoogipoo
0853554c24 Fix settings overlay not being initially visible 2021-08-18 15:11:52 +09:00
smoogipoo
c66abf85f7 Remove match header 2021-08-18 14:04:44 +09:00
Salman Ahmed
8c5d99ab21 Override CreateInstance() in osu! bindable subclasses
Three bindables are left which don't have this overriden due to them
already not having a value-only constructor and not supporting
`GetBoundCopy()` properly:
 - `BeatmapDifficultyCache.BindableStarDifficulty`.
 - `TotalScoreBindable`
 - `TotalScoreStringBindable`

I could add support for them by passing the required data to them, as
they seem to be able to have that shared, but I'm hesitant to support
something which was already broken and never used, not sure.
2021-08-18 04:19:58 +03:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat 2021-08-17 20:08:01 +09:00
Dan Balasescu
d8e9845d00
Merge pull request #14360 from peppy/improve-timeline-tick-visibility
Improve visibility of repeat ticks / drag areas on timeline
2021-08-17 20:06:49 +09:00
smoogipoo
47d4a2e97f Make SettingsOverlay protected 2021-08-17 20:05:26 +09:00
smoogipoo
590d814881 Move RoomSettingsOverlay to RoomSubScreen 2021-08-17 18:24:04 +09:00
Dean Herbert
f16468b706 Improve visibility of repeat ticks / drag areas on timeline 2021-08-17 18:17:55 +09:00
smoogipoo
6840ec6716 Actually show the room in the sub screen 2021-08-17 17:58:24 +09:00
Dean Herbert
4a65888cfc
Merge branch 'master' into multiplayer-chat 2021-08-17 17:34:23 +09:00
Dean Herbert
ef9bfece13
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 17:31:25 +09:00
Dean Herbert
3b5fc6d10f Ensure updateLoadingLayer is run at least once 2021-08-17 17:18:23 +09:00
Dean Herbert
9eb16fa61d Move poll allowance logic based on signalr connection inside polling component 2021-08-17 17:16:21 +09:00
smoogipoo
5d72c5911a Rename MatchSettingsOverlay and related classes
Because "match" is a multiplayer-only concept.
2021-08-17 17:14:28 +09:00
smoogipoo
6416e64e06 Adjust sizings and paddings 2021-08-17 17:13:25 +09:00
smoogipoo
4b198d14eb Initial refactor of RoomSubScreen 2021-08-17 17:05:20 +09:00
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 16:23:46 +09:00
Dan Balasescu
b1efc6d763
Merge branch 'master' into local-user-play-info 2021-08-17 16:23:44 +09:00
Dean Herbert
6ee6a46894 Remove unnecessary public prefix in interface specification 2021-08-17 16:22:14 +09:00
Dean Herbert
124f149cb5 Add key binding to focus chat input 2021-08-17 16:17:31 +09:00
Dean Herbert
30eee363dc Add chat display during multiplayer gameplay 2021-08-17 16:17:31 +09:00
Dean Herbert
0d283aa6a3 Expose LocalUserPlaying from Player 2021-08-17 16:16:49 +09:00
Dean Herbert
82eddeffef Add LocalUserPlayInfo interface to convey common information about player status 2021-08-17 16:15:47 +09:00
Salman Ahmed
3a7b9bf096 Fix MatchSettingsOverlay not resetting focus on hide properly 2021-08-17 08:56:49 +03:00
smoogipoo
f4b7ee5c7f Merge branch 'master' into hide-player-settings-overlay 2021-08-17 13:44:33 +09:00
smoogipoo
081524b6c8 Privatise setters 2021-08-17 13:44:21 +09:00
Salman Ahmed
b419ea716b Refactor beatmap info wedge to not fully refresh on star difficulty change
Makes it look awkward when changing difficulty via mod settings for
example.

Now the changes should instead only affect the displayed components which consume it
directly.
2021-08-17 05:46:06 +03:00
smoogipoo
1e282432c9 Fix password in a better way 2021-08-17 09:40:25 +09:00
smoogipoo
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
smoogipoo
97d5b80834 Fix joining with incorrect password 2021-08-17 09:18:21 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
Marvin Schürz
78f9f4a230 Move time clamp to Seek/transformSeekTo methods 2021-08-16 20:39:09 +02:00
Lucas A
a0a9777109 Fix merge conflicts. 2021-08-16 14:50:00 +02:00
Lucas A
1f942d15f8 Localise scoreboard 2021-08-16 13:38:57 +02:00
Lucas A
7bebbf9f74 Mark format strings as verbatim. 2021-08-16 12:46:41 +02:00
Dean Herbert
3ad7688eaf
Merge pull request #14339 from peppy/revert-breaking-config-rename
Revert "Rename element in OsuSettings enum"
2021-08-16 19:18:22 +09:00
Dean Herbert
1c7cbc8621 Add missing readonly keyword to new bindable 2021-08-16 17:14:13 +09:00
Dean Herbert
8555a465ac
Merge pull request #14318 from bdach/editor-colours-save
Add support for saving edited combo colours and displaying them in composer
2021-08-16 17:07:53 +09:00
Dean Herbert
fc89f2bac4 Revert "Rename element in OsuSettings enum"
This reverts commit c2bbe17562.
2021-08-16 16:56:48 +09:00
Dean Herbert
8d45f86bd3 Rename variable to better reflect its purpose 2021-08-16 16:48:40 +09:00
Dean Herbert
ae8a1adae8 Allow seeking via Player.Seek even if disabled 2021-08-16 16:47:57 +09:00
Dean Herbert
838bcc51b2 Avoid new bindable requirement 2021-08-16 16:27:19 +09:00
Dean Herbert
81480ac4fc Use PlayerConfiguration to convey no-seek state 2021-08-16 16:16:02 +09:00
Salman Ahmed
7fe6f6dd14 Fix kick button action asserting and using User.User.ID rather than User.UserID 2021-08-16 09:47:23 +03:00
Salman Ahmed
79cd062784 Let TeamDisplay take the full MultiplayerRoomUser rather than the underlying User 2021-08-16 09:47:23 +03:00
smoogipoo
08d347f10b Merge branch 'master' into multi-polling-request-refactor 2021-08-16 13:12:08 +09:00
smoogipoo
b6a2020c59 General refactorings from PR review 2021-08-16 13:09:04 +09:00
smoogipoo
81f9442471 Inline update/addRoom in usage sites 2021-08-16 13:04:06 +09:00
Salman Ahmed
554b09ac1b Fix SkinnableTargetsContainer blocked from processing scheduled tasks 2021-08-16 06:57:45 +03:00
Dean Herbert
f0fe79b568 Remove buffered container workarounds for now 2021-08-16 11:04:21 +09:00
Dean Herbert
d35886ef19 Reduce frame buffer render scale for blurred background 2021-08-16 11:03:49 +09:00
Dean Herbert
e8e387b549 Cache buffered background to fix multiplayer lounge performance
Consider this a request for comment. It's the cleanest solution I can
come up with without dropping either the blur, or use of
`ModelBackedDrawable`.

Intended to resolve https://github.com/ppy/osu/issues/14276.
2021-08-16 08:04:54 +09:00
Nathan Alo
cc3468b4ab apply suggestions
- make `UserActivity.InGame` and derive that to `InSoloGame` and `InMultiplayerGame`
- rename `SoloGame` to `InSoloGame`
- rename `MultiplayerGame` to `InMultiplayerGame`
2021-08-16 06:32:33 +08:00
Bartłomiej Dach
6108451449
Retrieve separated skin instance from working beatmap for editing 2021-08-15 21:18:09 +02:00
Bartłomiej Dach
81280dfd25
Use editable skin structure in combo colour picker 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
0d64da8c63
Add skin providing container responding to beatmap skin edits 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
df43e758ee
Add editable beatmap skin 2021-08-15 21:18:07 +02:00
Marvin Schürz
d287db7961 Clamping seekTime to beatmap length 2021-08-15 14:48:56 +02:00
Nathan Alo
2cc096101e trim whitespace 2021-08-15 18:56:24 +08:00
Salman Ahmed
2ddf28346a PlayerSettingsGroups -> PlayerSettings 2021-08-14 19:58:20 +03:00
Nathan Alo
4ed06a1021 apply suggestions 2021-08-14 22:39:12 +08:00
kj415j45
c2bbe17562
Rename element in OsuSettings enum
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +08:00
Nathan Alo
a553942a7f update InitialActivity on multiplayer Player and SongSelect 2021-08-14 13:20:36 +08:00
Dean Herbert
b8c63eb1cb Merge branch 'master' into multiplayer-kick-support-events 2021-08-14 14:08:34 +09:00
Dean Herbert
a10ba17b64
Merge pull request #14250 from peppy/leaderboard-limit-player-count
Add ability for gameplay leaderboard scroll when too many users are displayed
2021-08-14 14:08:18 +09:00
Bartłomiej Dach
e2cc96097f
Unify match score display formatting
Commas are already applied on the multiplayer leaderboard, as well as
the results screen.
2021-08-13 23:57:51 +02:00
Bartłomiej Dach
00317c0e30
Round when totalling up team scores instead of truncating
Matches score handling in `ScoreManager`.
2021-08-13 23:44:07 +02:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 21:30:44 +02:00
smoogipoo
0e66a05963 Hide left border of beatmap wedge 2021-08-13 22:29:22 +09:00
smoogipoo
1c0ffd4621 Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:24:01 +09:00
smoogipoo
155e9e16a5 Refactorings 2021-08-13 22:09:47 +09:00
smoogipoo
d57508853e Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:04:31 +09:00
smoogipoo
44b3e3bfac Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 21:58:15 +09:00
smoogipoo
c71a581106 Fix exception when leaving match 2021-08-13 18:24:19 +09:00
smoogipoo
1f992e67f3 Fix listing polling rate when entering room 2021-08-13 18:17:25 +09:00
smoogipoo
1bae7173d3 Fix initial multiplayer poll 2021-08-13 18:14:02 +09:00
smoogipoo
6a46105b5e Fix incorrect dependency 2021-08-13 18:12:32 +09:00
smoogipoo
83935540ca Add selection polling component to PlaylistsRoomSubScreen 2021-08-13 18:11:52 +09:00
Dan Balasescu
62970108df
Merge pull request #14269 from peppy/remove-unnecessary-delimiters
Fix searches at song select with '!' or ',' not matching as expected
2021-08-13 18:00:11 +09:00
smoogipoo
7cbf4c48ed Fix multiplayer polling when not connected 2021-08-13 17:59:18 +09:00
smoogipoo
8910781bcd Move listing polling component to LoungeSubScreen 2021-08-13 17:39:09 +09:00
Dean Herbert
5a60b39643 Remove unnecessary delimiters from song select filter splitting 2021-08-13 16:42:58 +09:00
Dean Herbert
db52549152 Move below everything rather than proxying (works better with new design) 2021-08-13 16:20:53 +09:00
Dean Herbert
6a95fa0278 Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:20:38 +09:00
Dean Herbert
df24f7a81e
Merge pull request #14256 from smoogipoo/multiplayer-header-redesign
Update multiplayer header to the latest designs
2021-08-13 16:16:25 +09:00
Dean Herbert
f9f3339885 Fix vertical offset not being handled correctly during score panel detach process 2021-08-13 16:14:23 +09:00
Dan Balasescu
f47f2b43b0
Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:09:00 +09:00
Dean Herbert
732dcd30c7 Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 16:03:10 +09:00
Dean Herbert
dd7ca4b77b Increase "create room" button height 2021-08-13 15:35:45 +09:00
Dean Herbert
3b6a8a2bae Rename background sprite and reduce load delay 2021-08-13 15:25:00 +09:00
Dean Herbert
5cec50bdd1 Add comment mentioning why event bindings are not unbound 2021-08-13 15:24:43 +09:00
Dean Herbert
bf024fbd21
Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 15:06:37 +09:00
Dean Herbert
90755c0307 Replace condition with matching precalculated bool 2021-08-13 14:50:59 +09:00
Dean Herbert
93574acf72 Fix exception messaging 2021-08-13 14:46:57 +09:00
Dean Herbert
641d57e5e1 Change scroll container subclass name to hopefully read better 2021-08-13 14:46:28 +09:00
Dean Herbert
a1b72e7f97 Remove redundant array type specification 2021-08-13 14:41:07 +09:00
Dean Herbert
b9721f5261 Centralise screen exit logic and guard against non-current screen 2021-08-13 14:39:03 +09:00
Dean Herbert
0f45155b8e Fix remaining cases of invalid bindable operations during lease 2021-08-13 14:29:28 +09:00
Dean Herbert
92d4c9224a Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 14:28:14 +09:00
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
Salman Ahmed
34c2b317e2 Hide song progress bar on multi-spectator player 2021-08-13 07:30:09 +03:00
Salman Ahmed
e7cf6b2d23 Expire hold-to-quit button on multi-spectator player 2021-08-13 07:29:55 +03:00
Salman Ahmed
8dc7a925e7 Expire instead of hiding and disabling visibility state
Since it's a temporary change until the spectator interface gets
improved, no need to add further logic.
2021-08-13 07:28:59 +03:00
smoogipoo
e913c8f92f Change strings to verbatim 2021-08-13 13:07:02 +09:00
Salman Ahmed
c10320f239 Hide and disable player settings overlay on multi-spectator player 2021-08-13 06:35:16 +03:00
Salman Ahmed
2b86416cb2 Hide player settings overlay on multi-spectator player loader 2021-08-13 06:35:16 +03: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
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