1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 13:47:38 +08:00
Commit Graph

22991 Commits

Author SHA1 Message Date
smoogipoo
df2da5950f Add back vertical spacer 2021-02-05 13:09:13 +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
Salman Ahmed
d62bbbb762
Enhance documentation
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-05 00:38:56 +03:00
Joehu
4e530d2eaf Remove old alpha hack from nub fill 2021-02-04 13:05:37 -08:00
smoogipoo
dbea6d4cee Remove unused using 2021-02-05 00:57:23 +09:00
smoogipoo
18e5081523 Fix test failures 2021-02-05 00:42:38 +09: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
Dean Herbert
794f9e5e93 Add missing centre anchor/origin 2021-02-04 22:53:41 +09:00
Dan Balasescu
e374aebc5f
Merge branch 'master' into fix-mod-settings-serlisation-signalr50 2021-02-04 22:27:54 +09:00
Dean Herbert
8f2f1a444f Avoid resetting selection on deselecting incompatibile types 2021-02-04 19:55:09 +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
Dean Herbert
b2f1e133f8 Allow checkbox nub to be moved to the left 2021-02-04 16:53:55 +09:00
Dean Herbert
d165344070 Force newer version of MessagePack for fixed iOS compatibility 2021-02-04 15:19:57 +09:00
Dean Herbert
76cfeae7e9 Add support for Bindable int in config 2021-02-04 15:10:56 +09:00
Salman Ahmed
db3f9e7cbe Apply documentation suggestion 2021-02-04 02:20:18 +03:00
Bartłomiej Dach
cb87da2bb8
Merge branch 'master' into freemod-select-overlay 2021-02-03 22:19:35 +01:00
Dean Herbert
b06f4ee124
Merge branch 'master' into solo-mod-select-overlay 2021-02-03 23:44:08 +09:00
Dean Herbert
17072a5dda
Merge pull request #11664 from smoogipoo/modselect-dynamic-isvalid
Make it possible to change IsValidMod in mod selection
2021-02-03 23:43:36 +09:00
Dan Balasescu
75801097ea
Merge pull request #11632 from bdach/ongoing-tracker-fix-more
Fix ongoing operation tracker double-returning internal lease after screen exit
2021-02-03 23:17:53 +09:00
Dean Herbert
2a52851e68
Merge branch 'master' into modselect-dynamic-isvalid 2021-02-03 22:11:33 +09:00
Dean Herbert
77735ac9dc
Merge pull request #11663 from smoogipoo/modselect-disable-stacking
Allow mod buttons to not be stacked
2021-02-03 22:11:02 +09:00
Dean Herbert
b27557f278
Merge pull request #11667 from smoogipoo/fix-mod-icon
Fix ModIcon not updating background colour correctly
2021-02-03 22:06:29 +09:00
Dean Herbert
e3d323989c Switch to SignalR 5.0 and implement using better API 2021-02-03 22:04:14 +09:00
Dean Herbert
9d7164816c Add reverse binding for max attempts (currently unused but good for safety) 2021-02-03 22:02:40 +09:00
Dean Herbert
3fe190cfbe Show original error message on web exceptions (or is no message is returned) 2021-02-03 22:00:16 +09:00
Dan Balasescu
f24a6178bc
Merge branch 'master' into ongoing-tracker-fix-more 2021-02-03 21:00:45 +09:00
smoogipoo
65d45ec74c Unschedule cancellation 2021-02-03 20:50:22 +09:00
Dean Herbert
1380717ebb Use PrimitiveObjectFormatter to simplify code 2021-02-03 20:19:27 +09:00
Dean Herbert
d3f056f188 Add missing licence header 2021-02-03 20:06:25 +09:00
Dean Herbert
75f1ebd5f9 Add custom resolver for mod settings dictionary 2021-02-03 19:46:47 +09:00
smoogipoo
8295fb9081 Implement mania constant speed mod 2021-02-03 16:28:22 +09:00
smoogipoo
21d5f842fc Re-layout to reduce movement 2021-02-03 14:53:55 +09:00
Dan Balasescu
2a4488c11b
Merge branch 'master' into freemods 2021-02-03 14:12:39 +09:00
Bartłomiej Dach
fc84ec1313 Move anchor specification to central place 2021-02-02 22:18:14 +01:00
Bartłomiej Dach
181d2c672b Fix outdated comment 2021-02-02 22:05:25 +01:00
Bartłomiej Dach
fe7f4f7222
Merge branch 'master' into playlists-item-visual-improvements 2021-02-02 21:26:16 +01:00
Salman Ahmed
62d0036c81 Fix using private constructor on MessagePack object 2021-02-02 17:45:11 +03:00
Salman Ahmed
50d57a3931 Move tracker loading into BDL 2021-02-02 17:22:48 +03:00
Dean Herbert
abb32d11b5
Merge pull request #11662 from smoogipoo/refactor-mod-sections
Refactor mod sections and make them overridable
2021-02-02 23:12:34 +09:00
smoogipoo
aeb3ed8bb3 Renamespace footer button 2021-02-02 21:46:22 +09:00
smoogipoo
6453367a9c Merge branch 'freemod-select-overlay' into freemods 2021-02-02 21:43:35 +09:00
Dean Herbert
b76116d943
Merge branch 'master' into modselect-disable-stacking 2021-02-02 21:41:33 +09:00
smoogipoo
097ce37e96 Merge branch 'fix-mod-icon' into freemods 2021-02-02 21:37:24 +09:00
smoogipoo
921f008217 Fix ModIcon not updating background colour correctly 2021-02-02 21:35:08 +09:00
smoogipoo
6ff8e8dd37 Disable a few mods by default 2021-02-02 21:29:08 +09:00
smoogipoo
5a56e2ba4b Fix sound duplication due to checkbox 2021-02-02 21:29:00 +09:00
smoogipoo
f25535548a Fix buzzing on select all/deselect all 2021-02-02 21:20:16 +09:00
smoogipoo
643c0605d8 Implement the freemod selection overlay 2021-02-02 21:14:38 +09:00
smoogipoo
8b3a85daa7 Merge branch 'refactor-mod-sections' into freemod-select-overlay 2021-02-02 21:09:51 +09:00
smoogipoo
728f8599b2 Move incompatible mod deselection to SoloModOverlay 2021-02-02 21:06:32 +09:00
smoogipoo
e58ece9e10 Make ModSelectOverlay abstract 2021-02-02 21:06:04 +09:00
smoogipoo
50e92bd0ed Fix selection not being preserved when IsValidMod changes 2021-02-02 20:50:54 +09:00
smoogipoo
10ceddf3ff Make IsValidMod adjustable 2021-02-02 20:47:50 +09:00
smoogipoo
75f81bfa06 Add back mod validation 2021-02-02 20:35:41 +09:00
smoogipoo
6d620264f4 Allow mod buttons to not be stacked 2021-02-02 20:27:41 +09:00
smoogipoo
3741f05ab3 Refactor mod sections and make them overridable 2021-02-02 20:11:40 +09:00
Dean Herbert
ac5662b1aa
Merge branch 'master' into mod-consistency-function 2021-02-02 20:01:42 +09:00
Dean Herbert
4ecbe058f7
Merge pull request #11640 from smoogipoo/add-mod-utils
Add ModUtils class for validating mod usages
2021-02-02 20:01:20 +09:00
smoogipoo
2dece12a7c Disable/disallow freemods on incompatible/selected mods 2021-02-02 19:57:42 +09:00
Dean Herbert
41593ff09e Privatise protected property setters 2021-02-02 19:14:44 +09:00
smoogipoo
4fee762a4f Merge branch 'add-mod-utils' into freemods 2021-02-02 19:02:45 +09:00
smoogipoo
a2e3b1c0e4 Move Mods reset code to OnlinePlaySongSelect 2021-02-02 19:02:39 +09:00
smoogipoo
180af3c7f8 Add codeanalysis attribute 2021-02-02 19:02:09 +09:00
smoogipoo
8cc4de2396 Merge branch 'add-mod-utils' into freemods 2021-02-02 18:53:21 +09:00
Dean Herbert
fc3adaf612 Show maximum attempt count in room display (when not unlimited) 2021-02-02 18:45:05 +09:00
Dean Herbert
9b209d67dc Match size of participants text with host display 2021-02-02 18:45:05 +09:00
Dean Herbert
96d20bf607 Reduce height of ModeTypeInfo to match adjacent text sections 2021-02-02 18:45:05 +09:00
Dean Herbert
90acdd4361 Display the correct error message on score submission failure
The server will return a valid error message in most cases here. We may
eventually want to add some fallback message for cases an error may
occur that isn't of
[InvariantException](3169b33ccc/app/Exceptions/InvariantException.php (L9-L10)) type, but I'm not 100% sure
how to identify these just yet.
2021-02-02 18:45:05 +09:00
Dean Herbert
6fdaf02518 Hook up room-level max attempts to UI 2021-02-02 18:45:05 +09:00
smoogipoo
052cf1abae Reuse existing method 2021-02-02 18:42:02 +09:00
smoogipoo
5881b8be96 Merge branch 'add-mod-utils' into mod-consistency-function 2021-02-02 18:41:35 +09:00
Dean Herbert
c41c854ce3
Merge pull request #11637 from frenzibyte/improve-chat-autoscroll
Improve auto-scrolling logic for drawable channels
2021-02-02 18:40:25 +09:00
smoogipoo
12f52316cd Prevent multiple enumeration 2021-02-02 18:37:11 +09:00
smoogipoo
1df412a03c Fix incorrect handling of multi-mod incompatibilities 2021-02-02 18:31:08 +09:00
smoogipoo
d0655c21c6 Simplify implementation of CheckCompatibleSet 2021-02-02 18:18:57 +09:00
smoogipoo
8232d9d2fe Fix incorrect implementation 2021-02-02 18:01:38 +09:00
Dean Herbert
40233fb47c Make font bolder 2021-02-02 17:09:59 +09:00
Dean Herbert
6d9ac4d0f0 Increase darkness of gradient on buttons to make text readability (slightly) better 2021-02-02 16:57:27 +09:00
Dean Herbert
fb52ac8c69 Share remove from playlist button design with adjacent download button 2021-02-02 16:57:08 +09:00
Dean Herbert
bdc05af4b7 Make playlist settings area taller to better match screen aspect ratio 2021-02-02 16:30:45 +09:00
Dean Herbert
a76314a876 Use Update instead of UpdateAfterChildren (no need for the latter) 2021-02-02 15:57:17 +09:00
Dean Herbert
bb0753f68d Use a better method of cancelling user scroll 2021-02-02 15:44:03 +09:00
Dean Herbert
398ab9c2c2 Use UserTrackingScrollContainer instead 2021-02-02 15:29:38 +09:00
Dean Herbert
ed63b571d2 Add "new" override for ScrollToEnd To UserTrackingScrollContainer 2021-02-02 15:16:28 +09:00
Dean Herbert
1c645601d4 Fix typo in xmldoc 2021-02-02 14:14:31 +09:00
smoogipoo
0bce9d6833 Clear freemods when ruleset is changed 2021-02-02 13:54:58 +09:00