1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 01:32:55 +08:00
Commit Graph

36600 Commits

Author SHA1 Message Date
Vincent Maggioli
96652e07cd
Merge branch 'master' into zero-spinner-slider 2021-02-05 09:40:55 -05:00
Dean Herbert
dd4207cb4e
Merge pull request #11661 from peppy/playlist-max-room-attempts
Add support for setting the maximum attempt count for a playlist
2021-02-05 23:40:38 +09:00
vmaggioli
5061231e59
Switch to beat length 2021-02-05 09:39:14 -05:00
Dean Herbert
7f82a06a61 Remove no longer used using directive 2021-02-05 23:08:31 +09:00
Dean Herbert
0679901e4d Update error handling 2021-02-05 22:53:40 +09:00
Dean Herbert
3ca64a1cb2 Merge branch 'master' into playlist-max-room-attempts 2021-02-05 22:13:13 +09:00
Dean Herbert
c94fc3bc62
Merge pull request #11684 from smoogipoo/fix-freemods-flashing
Fix mods on participant panels flashing when changed
2021-02-05 19:29:05 +09:00
smoogipoo
95ad7ea8f7 Fix mods on participant panels flashing when changed 2021-02-05 18:44:33 +09:00
Dan Balasescu
3997cd4104
Merge pull request #11681 from peppy/fix-crash-on-incompatible-freemod-selection
Fix crashes when setting a mod in free mod select overlay which requires deselection of another mod
2021-02-05 17:55:16 +09:00
Dean Herbert
630c5bb747 Avoid potential crashes when lease is held on SelectedMods 2021-02-05 16:46:21 +09:00
Dean Herbert
3e750feaa4 Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection 2021-02-05 16:42:35 +09:00
Dean Herbert
2fc3a97f56
Merge pull request #11516 from frenzibyte/ready-button-clean-up
Replace ready button beatmap logic with using `MultiplayerBeatmapTracker` instead
2021-02-05 15:09:25 +09:00
Dean Herbert
de8724b1f6 Use AddRangeInternal for simplicity, but disallow ClearInternal for safety 2021-02-05 14:39:25 +09:00
Dean Herbert
fc37d8b7df Refactor content redirection logic to be easier to parse 2021-02-05 14:25:19 +09:00
Dean Herbert
9258836f10
Merge pull request #11641 from smoogipoo/freemods
Add support for optional per-user mods in multiplayer (aka freemod)
2021-02-05 13:59:30 +09:00
Salman Ahmed
78ea2d50bb Merge branch 'master' into ready-button-clean-up 2021-02-05 07:23:11 +03:00
Dan Balasescu
56f9dae4f6
Merge pull request #11515 from frenzibyte/multiplayer-beatmap-tracker
Add beatmap availability tracker component for multiplayer and playlists
2021-02-05 13:14:23 +09:00
smoogipoo
df2da5950f Add back vertical spacer 2021-02-05 13:09:13 +09:00
smoogipoo
8004c19a80 Remove ModValidationTest 2021-02-05 12:40:42 +09:00
smoogipoo
2e85ce5b82 Rename UserMods -> Mods for MultiplayerRoomUser 2021-02-05 12:40:16 +09:00
smoogipoo
85e63afcb4 Rename Mods -> RequiredMods 2021-02-05 12:36:25 +09:00
Dan Balasescu
a71d6a4c97
Merge branch 'master' into multiplayer-beatmap-tracker 2021-02-05 12:25:36 +09:00
smoogipoo
a2fdba3e51 Rename to OnlinePlayBeatmapAvailabilityTracker 2021-02-05 12:24:38 +09:00
Dan Balasescu
daece0104c
Merge pull request #11675 from Joehuu/remove-old-alpha-hack
Remove old alpha hack from nub fill
2021-02-05 11:13:47 +09:00
Dean Herbert
16af956082
Merge pull request #11676 from Joehuu/fix-codefactor-style-issues
Fix codefactor style issues
2021-02-05 10:04:55 +09:00
Dean Herbert
270cd817d6
Merge pull request #11677 from Joehuu/fix-readme-version-badge 2021-02-05 10:04:02 +09:00
Joehu
c0bd27fe83 Fix readme version badge not linking to correct page 2021-02-04 13:55:15 -08:00
Salman Ahmed
d62bbbb762
Enhance documentation
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-05 00:38:56 +03:00
Joehu
9ef130cdcc Fix codefactor style issues 2021-02-04 13:28:35 -08:00
Joehu
4e530d2eaf Remove old alpha hack from nub fill 2021-02-04 13:05:37 -08:00
smoogipoo
cf5233c6ab Merge branch 'master' into freemods 2021-02-05 00:27:14 +09:00
Dean Herbert
06a3a72e43
Merge pull request #11670 from smoogipoo/mania-constant-speed-mod
Implement mania constant speed mod
2021-02-05 00:26:04 +09:00
Dean Herbert
4730cf02d0
Merge pull request #11666 from smoogipoo/freemod-select-overlay
Implement the freemod selection overlay
2021-02-05 00:25:43 +09:00
Dean Herbert
0750c3cb6a Add back immediate deselection flow to ensure user selections can occur without contention 2021-02-04 23:44:46 +09:00
Dan Balasescu
2229e6cd3e
Merge pull request #11673 from peppy/fix-mod-settings-serlisation-signalr50
Add custom MessagePack resolver for mod settings dictionary
2021-02-04 23:00:05 +09:00
Dean Herbert
794f9e5e93 Add missing centre anchor/origin 2021-02-04 22:53:41 +09:00
Dean Herbert
f86f323625 Add a basic guard against setting ScrollMethod too late in initialisation 2021-02-04 22:28:17 +09:00
Dan Balasescu
e374aebc5f
Merge branch 'master' into fix-mod-settings-serlisation-signalr50 2021-02-04 22:27:54 +09:00
Dean Herbert
cef16a9f61 Add test coverage of animation / selection flushing 2021-02-04 19:55:15 +09:00
Dean Herbert
8f2f1a444f Avoid resetting selection on deselecting incompatibile types 2021-02-04 19:55:09 +09:00
Dean Herbert
15062cc63f Fix intermittent test failures 2021-02-04 19:29:48 +09:00
Dean Herbert
bf239f8bef Flush animation on closing mod overlay 2021-02-04 19:12:37 +09:00
Dean Herbert
a2674f3c3f Add comments 2021-02-04 18:58:56 +09:00
Dean Herbert
223b858227 Ramp the animation speed 2021-02-04 18:56:40 +09:00
Dean Herbert
f23ca7c7cf Centralise selection animation logic 2021-02-04 18:10:55 +09:00
Dean Herbert
4bfe3aabdc Simplify sound debounce logic 2021-02-04 17:06:11 +09:00
Dean Herbert
daf7ab9422 Apply the expected font to the checkbox's label 2021-02-04 16:58:15 +09:00
Dean Herbert
b32e10514d Fix padding on label text not being double-applied (meaning no padding between nub and text) 2021-02-04 16:58:02 +09:00
Dean Herbert
48a58e790e Don't specify arbitrary width 2021-02-04 16:57:39 +09:00
Dean Herbert
3148bbda2a Allow custom font to be used in OsuCheckbox 2021-02-04 16:54:17 +09:00