1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 21:57:19 +08:00

23199 Commits

Author SHA1 Message Date
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
smoogipoo
4194c9308e Add xmldoc 2021-02-02 13:50:05 +09:00
smoogipoo
173e20938c Revert changes to ModDisplay 2021-02-02 13:49:58 +09:00
smoogipoo
53cfc3bc6e Make ModIcon a bit more safe 2021-02-02 13:42:45 +09:00
smoogipoo
1d3dff8c75 Refactor ModDisplay flag usage 2021-02-02 13:41:01 +09:00
smoogipoo
87f9e46b16 Add option to select all 2021-02-02 13:37:25 +09:00
smoogipoo
9c3c0895cf Hide customise button + multiplier label 2021-02-02 13:36:58 +09:00
Dean Herbert
0d5353008c Update sentry sdk usage 2021-02-02 13:34:37 +09:00
smoogipoo
7a14e14e67 Refactor condition
This won't make any noticeable difference, but is the more correct way
to handle MultiMod because flattening works through infinite recursion levels.
2021-02-02 12:54:26 +09:00
smoogipoo
b54f65c282 Exclude more mods from multiplayer 2021-02-02 12:48:15 +09:00
smoogipoo
4cf52077b6 Make checkbox also respond to all mods selected 2021-02-02 11:11:28 +09:00
dependabot-preview[bot]
216b0d89a7
Bump Sentry from 2.1.8 to 3.0.1
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.8 to 3.0.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.8...3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 19:16:51 +00:00
Salman Ahmed
5c28c030c8 Unconditionally set "autoscroll" state 2021-02-01 22:08:57 +03:00
Salman Ahmed
15fcabb128
Add documentation to auto-scroll leniency
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-02-01 22:04:44 +03:00
dependabot-preview[bot]
286726feb0
Bump SharpCompress from 0.26.0 to 0.27.1
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.26.0 to 0.27.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.26...0.27.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 17:44:30 +00:00
Dan Balasescu
c70dd2edfc
Merge pull request #11569 from peppy/fix-editor-new-beatmap-crash
Fix a potential crash when exiting the editor before a new beatmap is added to the database
2021-02-01 21:01:51 +09:00
Dean Herbert
425dc8a210 Ensure mods are always in a valid state at a game level 2021-02-01 20:20:19 +09:00
Dean Herbert
ead8262257 Add function to check for (and return) invalid mods 2021-02-01 20:20:10 +09:00
smoogipoo
97e3023df9 Renamespace/rename MatchSongSelect -> PlaylistsSongSelect 2021-02-01 20:16:58 +09:00