1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Commit Graph

36396 Commits

Author SHA1 Message Date
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
Dean Herbert
2d7c3d95c0
Merge pull request #11642 from peppy/mod-consistency-function
Fix invalid mod combinations potentially being selectable at a game level
2021-02-02 20:46:05 +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
Dean Herbert
8e70a50af0 Remove unused using statement 2021-02-02 19:22:13 +09:00
smoogipoo
180af3c7f8 Add codeanalysis attribute 2021-02-02 19:02:09 +09:00
smoogipoo
0a9861d0ab Use TestCaseSource and add multi-mod test 2021-02-02 18:51:13 +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
9955e02898 Make more tests use the custom mod classes
For safety purposes... In implementing the previous tests, I found that
using mod.Object.GetType() can lead to bad assertions since the same
ModProxy class is used for all mocked classes.
2021-02-02 18:33:14 +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
smoogipoo
7c29386717 Add failing tests 2021-02-02 18:01:33 +09:00
Dan Balasescu
45758a5f7f
Merge pull request #11657 from peppy/fix-playlist-lounge-test-scene
Fix PlaylistLoungeTestScene appearing very narrow
2021-02-02 17:33:14 +09:00
Dan Balasescu
627c55f748
Merge pull request #11658 from peppy/playlists-settings-taller-area
Make playlist settings area taller to better match screen aspect ratio
2021-02-02 17:32:47 +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
43052991f8 Remove unused using statement 2021-02-02 16:18:55 +09:00
Dean Herbert
3002fef05e Remove empty parenthesis 2021-02-02 16:11:13 +09:00
Dean Herbert
54c0bdf7d3 Fix PlaylistLoungeTestScene appearing very narrow 2021-02-02 16:04:42 +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
b3105fb292 Add coverage of local echo messages performing automatic scrolling 2021-02-02 15:46:42 +09:00
Dean Herbert
3670bd40c2 Add test coverage of user scroll overriding 2021-02-02 15:44:11 +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
44ed705388
Merge pull request #11647 from ppy/dependabot/nuget/Sentry-3.0.1
Bump Sentry from 2.1.8 to 3.0.1
2021-02-02 14:43:06 +09:00
Dean Herbert
1c645601d4 Fix typo in xmldoc 2021-02-02 14:14:31 +09:00
Dean Herbert
80d88024d6 Add basic test coverage of CheckValidForGameplay function 2021-02-02 14:13:50 +09:00
Dean Herbert
0d5353008c Update sentry sdk usage 2021-02-02 13:34:37 +09:00
Salman Ahmed
dcb1626e4d Remove no longer necessary field 2021-02-01 22:38:42 +03: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
Dean Herbert
344dc5d6a9
Merge pull request #11644 from ppy/dependabot/nuget/DiscordRichPresence-1.0.175
Bump DiscordRichPresence from 1.0.169 to 1.0.175
2021-02-02 04:15:30 +09: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
Dean Herbert
6ec4cf20d3
Merge pull request #11646 from ppy/dependabot/nuget/ppy.osu.Framework.NativeLibs-2021.115.0 2021-02-02 03:20:00 +09:00
dependabot-preview[bot]
57213e6308
Bump DiscordRichPresence from 1.0.169 to 1.0.175
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.169 to 1.0.175.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 18:09:07 +00:00
dependabot-preview[bot]
0560676236
Bump ppy.osu.Framework.NativeLibs from 2020.923.0 to 2021.115.0
Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2020.923.0 to 2021.115.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2020.923.0...2021.115.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 18:09:05 +00:00
Dean Herbert
9d7bec25da
Merge pull request #11651 from ppy/dependabot/nuget/SharpCompress-0.27.1
Bump SharpCompress from 0.26.0 to 0.27.1
2021-02-02 03:07:52 +09: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
b9832c1b2d Add ModUtils class for validating mod usages 2021-02-01 19:37:24 +09:00
Dean Herbert
328bd191d4
Merge pull request #11561 from Mysfit/fix-storyboard-samples
Fix storyboard samples continuing to play when the beatmap is paused or intro is skipped
2021-02-01 17:48:08 +09:00
Salman Ahmed
49e62c3a4b
Apply documentation changes
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-01 11:02:08 +03:00
Dean Herbert
05982f42ab Add more comprehensive commenting and simplify base call logic
We can call the base method regardless for better safety. Worst case
it's just going to run `Stop()` twice anyway.
2021-02-01 16:43:54 +09:00