1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Commit Graph

36593 Commits

Author SHA1 Message Date
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
smoogipoo
f166c4c414 Rename test 2021-02-02 11:04:09 +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
97e3023df9 Renamespace/rename MatchSongSelect -> PlaylistsSongSelect 2021-02-01 20:16:58 +09:00
smoogipoo
97247b7a67 Fix unset key 2021-02-01 19:59:18 +09:00
smoogipoo
b9832c1b2d Add ModUtils class for validating mod usages 2021-02-01 19:37:24 +09:00
smoogipoo
e5ca9b1e50 Remove usage of removed method 2021-02-01 19:28:33 +09:00
smoogipoo
9c4c47599f Merge branch 'master' into freemods 2021-02-01 19:28:10 +09:00
smoogipoo
76ebb3811a Fix mod icons potentially having incorrect colours 2021-02-01 19:08:52 +09:00
smoogipoo
ee92ec0a5c Disallow local user mod customisation 2021-02-01 18:54:47 +09:00
smoogipoo
89a42d60fb General cleanup 2021-02-01 18:50:32 +09:00
smoogipoo
3a906a89fc Pin mod position in participant panels 2021-02-01 18:27:15 +09:00
smoogipoo
51cb288717 Reduce mod selection height 2021-02-01 18:18:59 +09:00
smoogipoo
e134af82f5 Stack freemods for the local user 2021-02-01 18:16:38 +09:00
smoogipoo
3e74f8fd9e Disable customisation of freemods, move stacking to property 2021-02-01 18:11:20 +09:00
smoogipoo
3cd30d284e Renamespace 2021-02-01 18:08:49 +09:00
smoogipoo
f538963607 Extra mods -> user mods 2021-02-01 17:57:32 +09:00
smoogipoo
ac2a995041 Add user and panel states 2021-02-01 17:54:56 +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
Dean Herbert
1d8de2f718 Rename class to better match purpose 2021-02-01 17:32:54 +09:00
Dean Herbert
fabb0eeb29 Add signalr messagepack key attribute 2021-02-01 17:27:14 +09:00
Dean Herbert
c73a05d0b5
Merge branch 'master' into multiplayer-beatmap-tracker 2021-02-01 17:24:24 +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
Dean Herbert
25614c7923
Merge pull request #11636 from bdach/fix-time-ramp-calculation
Fix incorrect speed change calculation in time ramp mods
2021-02-01 16:32:44 +09:00
Dean Herbert
0dd1208579
Merge pull request #11626 from peppy/fix-spinner-spm-negative
Ensure spinners only handle input during their hittable time
2021-02-01 16:27:22 +09:00
smoogipoo
0909c73ead Once again disallow DT/etc as allowable mods 2021-02-01 15:07:56 +09:00
smoogipoo
b43e529964 Fix allowed mods being copied into required mods 2021-02-01 15:07:43 +09:00
smoogipoo
426569c2a9 Move common song select implementation for online play 2021-02-01 14:57:39 +09:00
smoogipoo
b846146f16 Update mods when resuming room subscreen 2021-02-01 13:58:44 +09:00
smoogipoo
4ae10b1e1c Add initial UI for selecting extra mods 2021-02-01 13:40:59 +09:00
smoogipoo
e02e3cf19a Disallow selecting DT/HT/WU/WD as allowable freemods 2021-02-01 13:35:48 +09:00
smoogipoo
797a810287 Allow unstacking mods 2021-02-01 13:24:56 +09:00
smoogipoo
230b347c1e Move ModSelectOverlay.IsValidMod to a property 2021-02-01 12:18:11 +09:00
Salman Ahmed
e806e5bcd1 Improve robustness of chat auto-scrolling logic
Fix auto-scrolling state changing by old messages removal logic
2021-01-31 23:45:49 +03:00
Salman Ahmed
39d46d21e6 Add failing test case 2021-01-31 23:44:51 +03:00