1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 10:07:28 +08:00
Commit Graph

29535 Commits

Author SHA1 Message Date
Dan Balasescu
f9e3d9bb92
Merge branch 'master' into i-working-beatmap/difficulty-calculator 2021-11-16 17:46:38 +09:00
Dean Herbert
2dd721f760 Fix incorrect CancellationToken being used for inner check during leaderboard updates 2021-11-16 17:41:16 +09:00
Dean Herbert
6dd684588a Merge branch 'master' into playlist-show-invalid-beatmaps 2021-11-16 17:25:33 +09:00
Dean Herbert
2d125893fc Add tests and disable selection on invalid items 2021-11-16 17:23:52 +09:00
Dan Balasescu
96dddc8a0b
Merge pull request #15627 from peppy/playlist-item-iruleset
Update `PlaylistItem` to use `IRulesetInfo`
2021-11-16 17:15:09 +09:00
Dean Herbert
6f82e6351f Parse osu-web error text to present invalid items to the user in a more approachable format 2021-11-16 17:14:15 +09:00
Dean Herbert
e78c5d0858 Show loadingLayer before calling CreateRoom
This fixes `TestScenePlaylistsMatchSettingsOverlay` incorrectly leaving
the loading layer visible.
2021-11-16 17:14:15 +09:00
Dean Herbert
aa188d5a52 Add ability for playlist items to be marked as invalid 2021-11-16 17:01:24 +09:00
Dan Balasescu
f6ae0ec715
Merge pull request #15642 from peppy/external-update-provider
Add update manager which performs no update action
2021-11-16 16:59:33 +09:00
Dean Herbert
49cdcffa30 Simplify schedule logic in DrawableRoomPlaylistItem 2021-11-16 16:58:44 +09:00
Dean Herbert
f5c52755c9 Merge branch 'master' into i-working-beatmap/difficulty-calculator 2021-11-16 16:19:22 +09:00
Dan Balasescu
ddf2fade1a
Merge branch 'master' into playlist-item-iruleset 2021-11-16 16:19:10 +09:00
Dan Balasescu
c8038df509 Fix CI inspections 2021-11-16 16:06:30 +09:00
Dan Balasescu
00f0321f25 Add nullable equality comparers 2021-11-16 15:44:47 +09:00
Dean Herbert
726a0cc091 Merge branch 'master' into beatmap-collection-inteface-types 2021-11-16 15:31:10 +09:00
Dan Balasescu
29d0d5badf Rename QueueModes -> QueueMode 2021-11-16 14:53:10 +09:00
Dan Balasescu
5c3141d16a Fix ready button tooltip showing when locally available 2021-11-16 14:48:52 +09:00
Dean Herbert
d2a7670494 Remove no longer used helper method 2021-11-16 14:48:02 +09:00
Dean Herbert
6cca657a2d Standardise naming of CancellationToken parameters 2021-11-16 14:45:51 +09:00
Dan Balasescu
01f3649d75 Rename variables for readability 2021-11-16 14:44:47 +09:00
Dean Herbert
53c0682a08 Merge branch 'master' into beatmap-cancellation-token 2021-11-16 14:43:13 +09:00
Dan Balasescu
f414877d00 Rename UserID -> OwnerID 2021-11-16 14:37:54 +09:00
Dan Balasescu
41e46f158f Fix tests following playlist changes
Also more closely follows the server implementation.
2021-11-16 14:37:33 +09:00
Dean Herbert
71fef241df Fix recursive equality call on APIBeatmap and APIBeatmapSet 2021-11-16 14:13:47 +09:00
Dan Balasescu
9076519710 Give MultiplayerRoom a playlist, remove RequestAllPlaylistItems() 2021-11-16 14:13:43 +09:00
Dean Herbert
2cbdac91ad Add missing APIUser comparison method 2021-11-16 12:44:20 +09:00
Dean Herbert
fbc46941fa Add type safety to MatchesOnlineID extension methods 2021-11-16 12:37:47 +09:00
Dean Herbert
68e2699043 Fix oversight in playlist matching logic 2021-11-16 12:35:18 +09:00
Dean Herbert
9207b87b76 Add back interface equality but limit to only matching types 2021-11-16 12:35:18 +09:00
Dean Herbert
3fe89293af Add update manager which performs no update action
This is to be used in cases where updates are handled by an external
means. See
https://github.com/flathub/flathub/pull/2619#issuecomment-969731305 for
initial usage.
2021-11-16 12:11:13 +09:00
Dan Balasescu
f0593115b2 Remove RemovePlaylistItem() server method for the time being 2021-11-16 12:08:53 +09:00
Dan Balasescu
459e819a5d Update todo 2021-11-16 00:50:23 +09:00
Dan Balasescu
d27edb3a25 Fix another potential crash from async load 2021-11-16 00:31:46 +09:00
Dan Balasescu
b9e38269e3 Prevent playlist mangling selection if not allowed 2021-11-16 00:31:46 +09:00
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
Dan Balasescu
5a1036a96a Merge branch 'master' into multi-queueing-modes 2021-11-15 22:46:40 +09:00
Dan Balasescu
2c45a327bb Remove JsonIgnores, require opt-in properties 2021-11-15 19:54:35 +09:00
Dan Balasescu
1d87b47fec Remove now-unnecessary R# disables 2021-11-15 19:40:31 +09:00
Dean Herbert
a90cfb4a2f Implement remaining properties via implicit implementation rather than interface methods 2021-11-15 19:30:46 +09:00
Dean Herbert
fabf253381 Update difficulty calculator tests to also use IWorkingBeatmap 2021-11-15 19:16:49 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Dean Herbert
62d670a3ca Update DifficultyCalculator to take an IWorkingBeatmap 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
a0e25d18cd Expose more of WorkingBeatmap via interface 2021-11-15 18:25:48 +09:00
Dan Balasescu
c8a01c35f7 Remove extra members from FromDatabaseAttributes 2021-11-15 18:11:07 +09:00
Dan Balasescu
45382a8127 Ignore some properties 2021-11-15 16:32:25 +09:00
Dean Herbert
5489b19c57 Update PlaylistItem to use IRulesetInfo 2021-11-15 16:13:03 +09:00
Dan Balasescu
0cfd6fdf04 Add to/from database mapping functions to difficulty attributes 2021-11-15 16:06:50 +09:00
Dan Balasescu
907499f73a Add json properties to difficulty attributes 2021-11-15 16:06:29 +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
611b9fe942 Remove now unused implementations of interface equality 2021-11-15 14:50:09 +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
18f73b985b Make ModelExtensions nullable enabled 2021-11-15 14:38:01 +09:00
Dean Herbert
0b4822b552 Remove newly added equality 2021-11-15 14:35:01 +09:00
Dean Herbert
a4c11e8813 Use extension method to compare online IDs 2021-11-15 14:34:50 +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
b58fe2d80a
Restructure card to use single tracker at the top level 2021-11-13 15:39:03 +01:00
Bartłomiej Dach
c38c95b373
Merge branch 'master' into beatmap-card/download-button 2021-11-13 14:59:59 +01: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
ce47f456ec Change API for retrieving playlist items on join 2021-11-13 04:42:14 +09:00
Bartłomiej Dach
58bad0ab25
Merge branch 'master' into fix-setting-header-text-overflow 2021-11-12 20:34:07 +01:00
Bartłomiej Dach
cb2d1f3f04
Use horizontally symmetrical padding rather than margin 2021-11-12 20:28:42 +01:00
Dan Balasescu
4aaf412ac9 Ensure one non-expired item when switching to host-only 2021-11-13 03:35:41 +09:00
Dan Balasescu
dbc23e224f Fix further test failures 2021-11-13 03:34:45 +09:00
Dan Balasescu
e31d7e8ad7 Fix new failing test 2021-11-13 02:32:20 +09:00
Dan Balasescu
867403d947 Update TestMultiplayerClient to be more in line with server 2021-11-13 01:42:54 +09:00
Dan Balasescu
25202316cc Add user id to APIPlaylistItem 2021-11-13 00:23:35 +09:00
Leon Gebler
9000d19c9e Update difficulty colour spectrum 2021-11-12 14:58:18 +01:00
Dan Balasescu
3b24ec3643 Merge branch 'master' into multi-queueing-modes 2021-11-12 22:16:04 +09:00
Dean Herbert
936ec5fe8f
Merge pull request #15591 from peppy/fix-android-score-imports
Fix android score imports not working
2021-11-12 21:11:27 +09:00
Dean Herbert
9f7e2750a5 Merge branch 'master' into beatmap-collection-inteface-types 2021-11-12 19:41:29 +09:00
Bartłomiej Dach
e66b637587
Merge branch 'master' into fix-android-score-imports 2021-11-12 11:40:15 +01:00
Dean Herbert
d2d66766d4
Merge branch 'master' into songselect-audio-improvements 2021-11-12 19:40:04 +09:00
Dean Herbert
d2c1bc1072 Update resources 2021-11-12 19:33:35 +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
f02b57c371
Limit new IsZipArchive method to MemoryStream for now
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-11-12 19:16:22 +09:00
Dean Herbert
5e88d59a26 Switch BeatmapInfo.OnlineID delegation to use property getter for conformity 2021-11-12 19:06:12 +09:00
Dean Herbert
1d962648c2 Standardise implementations 2021-11-12 19:00:27 +09:00
Dean Herbert
1c49c4a602 Fix incorrect type check 2021-11-12 18:32:39 +09:00
Dean Herbert
7349e5521a Update BeatmapCollection to use IBeatmapInfo 2021-11-12 18:16:36 +09:00
Dean Herbert
54cd1158a4 Add IBeatmapSetInfo equality support 2021-11-12 18:16:36 +09:00
Dean Herbert
a67e156883 Add IBeatmapInfo equality support 2021-11-12 18:11:33 +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
9c3a169272
Merge branch 'master' into fix-android-score-imports 2021-11-12 09:38:27 +01:00
Bartłomiej Dach
9d8b317dee
Merge branch 'master' into fix-failed-imports-thinking-correct 2021-11-12 09:08:04 +01:00
Dean Herbert
adf81d7fcd Add pathway to correctly handle stream-based imports which are not zip archives 2021-11-12 16:42:07 +09:00
Bartłomiej Dach
e2416d6f3b
Merge branch 'master' into display-string-on-null-reference 2021-11-12 08:37:40 +01:00
Dean Herbert
9fc4bb7055 Fix incorrect xmldoc 2021-11-12 16:17:46 +09:00
Dean Herbert
ad8a710a69 Fix failed imports being incorrectly considered as successfully importing for notification purposes 2021-11-12 16:10:46 +09:00
Bartłomiej Dach
759450502f
Merge branch 'master' into pp-counter-fixed-width 2021-11-12 08:05:56 +01:00
Dean Herbert
98dcf487da Add fallback case for GetDisplayString if called on a null reference 2021-11-12 16:02:51 +09: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
5c8c121446 Update behaviour to match server (removing playlist items) + tests 2021-11-11 23:39:15 +09: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
Bartłomiej Dach
40cffd1682
Expose HitEvents publically from ScoreProcessor 2021-11-11 13:22:07 +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
Dan Balasescu
1540352b4d
Merge pull request #15569 from peppy/avoid-throwing-unnecessary-exception
Gracefully handle missing type rather than triggering `ArgumentNullException`
2021-11-11 18:50:21 +09:00
Dean Herbert
4bca96d548 Throw again to ensure correct available state is set
Also standardises handling between `RulesetStore` and `RealmRulesetStore`.
2021-11-11 17:39:36 +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
Bartłomiej Dach
f38d6ef8db
Add failing test steps 2021-11-11 09:01:50 +01:00
Dan Balasescu
57c333b472
Remove unused using 2021-11-11 15:29:08 +09:00
Dean Herbert
ea536dea23 Gracefully handle missing type rather than triggering ArgumentNullException 2021-11-11 14:46:21 +09:00
Dean Herbert
98fa253e1e Replace usage of TypeNameHandling.All with custom type converter 2021-11-11 14:04:19 +09:00
Dean Herbert
16418ac2ab Remove outdated comments 2021-11-11 14:02:12 +09:00
Jamie Taylor
e33c1f9a41
Lower filter cutoff frequency 2021-11-11 11:00:55 +09:00
Bartłomiej Dach
222846290e
Update download progress bar appearance to match intended design 2021-11-10 18:38:52 +01:00
Dean Herbert
8371307709
Merge branch 'master' into editor-clipboard-refactor 2021-11-11 01:09:39 +09:00
Dean Herbert
17a05f4dd8
Merge pull request #15539 from bdach/display-string
Fix model download notifications not formatting model correctly
2021-11-11 01:09:19 +09:00
Bartłomiej Dach
91baaa73f3
Show download progress on card body rather than in button 2021-11-10 16:03:48 +01:00
Bartłomiej Dach
f090e5ca75
Restyle card buttons to resemble buttons more 2021-11-10 15:24:36 +01: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