1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:17:24 +08:00
Commit Graph

36377 Commits

Author SHA1 Message Date
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
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
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
Bartłomiej Dach
a0de1cbfd0 Handle no-duration single-object edge case 2021-01-31 21:09:41 +01:00
Bartłomiej Dach
547b3d8bed Fix speed change calculation in time ramp mods 2021-01-31 20:34:56 +01:00
Bartłomiej Dach
81b052b866 Add failing test cases 2021-01-31 20:34:22 +01:00
Dean Herbert
adc57dd94b
Merge pull request #11635 from bdach/storyboard-loop-type-decoding
Fix invalid numeric values for storyboard animation type parsing incorrectly
2021-02-01 00:50:22 +09:00
Bartłomiej Dach
b9a49d5589 Coerce undefined animation loop types to Forever 2021-01-31 15:43:58 +01:00
Bartłomiej Dach
d7e5a21213 Add failing test case 2021-01-31 15:43:58 +01:00
Bartłomiej Dach
fec3bd898e
Merge pull request #11500 from peppy/fix-skin-dropdown-update-crash 2021-01-30 13:34:00 +01:00
Bartłomiej Dach
6a1387191a
Merge branch 'master' into fix-skin-dropdown-update-crash 2021-01-30 13:01:52 +01:00
Bartłomiej Dach
ae08ef2543 Reset SPM counter state on DHO application 2021-01-29 20:32:45 +01:00
Bartłomiej Dach
44e88f09e5
Merge pull request #11625 from peppy/fix-beatmap-cache-lookup-null-failure
Fix SQLite exception thrown is a beatmap lookup is attempted without an OnlineBeatmapID present
2021-01-29 18:58:00 +01:00
Dean Herbert
d521bfc251 Don't directly update HandleUserInput (as it is used by mods) 2021-01-30 02:35:11 +09:00
Dean Herbert
5a306dfc2b Fix unused using 2021-01-29 20:22:25 +09:00
Dean Herbert
f25809d35f Ensure spinners only handle input during their hittable time
While this was already being enforced inside of `CheckForResult`, the
internal tracking values of rotation were still being incremented as
long as the `DrawableSpinner` was present. This resulted in incorrect
SPM values being displayed if a user was to start spinning before the
object's `StartTime`.

Kind of annoying to write a test for (there's no setup for spinners yet)
but am willing to do so if that is deemed necessary.

Closes https://github.com/ppy/osu/issues/11600.
2021-01-29 19:55:55 +09:00
Dean Herbert
16f3d1815f Fix SQLite exception thrown is a beatmap lookup is attempted without an OnlineBeatmapID present
It turns out the SQLite API isn't smart enough to handle nullables
directly, so we need to help it out a bit.

Stops the following from being thrown:

```
System.InvalidOperationException: Value must be set.
   at Microsoft.Data.Sqlite.SqliteParameter.Bind(sqlite3_stmt stmt) = 3
at
   at Microsoft.Data.Sqlite.SqliteParameterCollection.Bind(sqlite3_stmt
stmt) = 3 at
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader(CommandBehavior
behavior)
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader()
   at
osu.Game.Beatmaps.BeatmapManager.BeatmapOnlineLookupQueue.checkLocalCache(BeatmapSetInfo
set, BeatmapInfo beatmap) in
/Users/dean/Projects/osu/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs:line
166 = 166
```
2021-01-29 19:53:57 +09:00
Dan Balasescu
cd8ef5373d
Merge pull request #11622 from peppy/remove-unobserved-exception-handling
Remove all usage of CatchUnobservedExceptions
2021-01-29 19:31:07 +09:00
Dean Herbert
d52376cc17
Merge pull request #11623 from Firmatorenio/apply-sv-to-taiko-diffadjust
Add scroll speed adjustment to taiko's DifficultyAdjust mod
2021-01-29 19:25:17 +09:00
Dean Herbert
18e6afbec0 Ensure the item is present before trying to select it 2021-01-29 19:17:12 +09:00
Dean Herbert
1ce383fc20 Merge branch 'master' into fix-skin-dropdown-update-crash 2021-01-29 19:16:20 +09:00
smoogipoo
ab9a3e6dd0 Pass allowed mods and consume on server callback 2021-01-29 18:21:22 +09:00
Firmatorenio
37ef5c7072 rename SliderVelocity to ScrollSpeed 2021-01-29 15:04:55 +06:00
Dean Herbert
a61444690e Remove all usage of CatchUnobservedExceptions
This should no longer be required with the recent framework side change
that stops a game from crashing on unobserved exceptions
(https://github.com/ppy/osu-framework/pull/4171).
2021-01-29 16:32:29 +09:00
Firmatorenio
449f883be1 add SV multiplier adjustment to TaikoModDifficultyAdjust 2021-01-29 11:48:51 +06:00
Dan Balasescu
4c4770bf4b
Merge pull request #11618 from vltspr/catch-auto-fix
Fix Catch autoplay rewinding on instantaneous hits
2021-01-29 12:17:46 +09:00
Corentin PALLARD
d168de0ae3 Formatting 2021-01-29 03:03:23 +01:00