1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

32141 Commits

Author SHA1 Message Date
Bartłomiej Dach
6630b38c08
Make all ModRateAdjust implementations incompatible with each other 2022-04-07 22:38:46 +02:00
Bartłomiej Dach
3016ce7817
Merge branch 'master' into bindable-safety-skin-editor 2022-04-07 20:59:44 +02:00
Bartłomiej Dach
e658b63dbc
Merge branch 'master' into clock 2022-04-07 20:27:23 +02:00
Salman Ahmed
a616f5bc2a Fix regressed digital clock width conditional 2022-04-07 19:24:15 +03:00
Dean Herbert
11b4c5ca87 Fix potential null ref if UpdateTargetScreen is called too early 2022-04-07 23:42:42 +09:00
Salman Ahmed
c323020fcf Fix Use24HourDisplay conditional flipped 2022-04-07 15:56:28 +03:00
Salman Ahmed
fb9fe4213d Fix skin texture lookups not handling paths with extensions 2022-04-07 15:07:30 +03:00
Dean Herbert
a4d3afd06d Fix multiple issues with bindable safety in SkinEditor components 2022-04-07 19:12:12 +09:00
Dean Herbert
b2c0eaeab4 Make string read better 2022-04-07 18:20:15 +09:00
Dean Herbert
555aee7b6a Remove incorrect and pointless complexity to width changes 2022-04-07 18:16:14 +09:00
Dean Herbert
7530fe5adf Move default specification to configuration initial value 2022-04-07 18:13:23 +09:00
Dean Herbert
37509e04a9 Rename variable and fix inspections 2022-04-07 18:11:30 +09:00
Dan Balasescu
f0698937b7
Merge pull request #17700 from peppy/fix-skin-lookups-extension-specified
Fix filename lookups on `LegacySkin`s going awry when extension is specified
2022-04-07 17:03:27 +09:00
Dan Balasescu
5af93bd85d
Merge pull request #17701 from peppy/fix-storyboard-animation-sizing
Fix storyboard animations getting incorrect positioning due to size not being set
2022-04-07 17:00:39 +09:00
Dean Herbert
a7e262627f Fix DrawableStoryboardAnimation not specifying sizing correctly
Usually this would be handled by `TextureAnimation`, but because we are
inheriting from `DrawableAnimation` here for reasons, we needed to
implement this ourselves. Follows the implementation in
`TextureAnimation`.
2022-04-07 15:18:55 +09:00
Dean Herbert
eb0653fa7b
Merge pull request #17698 from Joehuu/fix-replay-button-local-being-disabled
Fix replay button being disabled when available locally but not online
2022-04-07 14:18:02 +09:00
Dean Herbert
205edb65a2 Fix filename lookups on LegacySkins going awry when extension is specified
Due to the logic present to handle `@2x` fallback, the extension was
potentially being added at the wrong point in the filename. This change
ensures that the lookup filenames are always correct.

Closes https://github.com/ppy/osu/issues/17690.
2022-04-07 14:16:19 +09:00
Dean Herbert
9ed4f31048 Update resources 2022-04-07 13:35:07 +09:00
Joseph Madamba
358931842f Move enabled setting to each case 2022-04-06 21:22:56 -07:00
Jamie Taylor
8a73831115
Add MP lobby 'warning' SFX for the final seconds of countdown 2022-04-07 13:12:33 +09:00
Joseph Madamba
4432a93d09 Fix replay button being disabled when available locally but not online 2022-04-06 20:43:56 -07:00
Dan Balasescu
c997d0fcf0
Merge pull request #17631 from bdach/mod-overlay/full-screen
Implement basic layout & behaviour of new mod select screen
2022-04-07 10:23:49 +09:00
Dan Balasescu
4c20e67478
Merge pull request #17683 from huoyaoyuan/remove-outdated
Remove some outdated packages
2022-04-07 10:13:15 +09:00
Dan Balasescu
c440d89ef9
Merge pull request #17678 from peppy/get-virtual-time-length
Change `WorkingBeatmap.GetVirtualTrack` to use length provided by `BeatmapInfo`
2022-04-07 09:32:59 +09:00
Dan Balasescu
4b3569ea79
Merge pull request #17576 from peppy/fix-multiplayer-unobserved
Centralise exception handling of `MultiplayerClient` calls
2022-04-07 09:09:55 +09:00
Huo Yaoyuan
ec4f1bcbc8 Remove outdated NETCore packages. 2022-04-06 19:18:18 +08:00
Dean Herbert
c42ef43faa Ensure intro beatmap has protected flag set
In cases this isn't set, the beatmap has likely entered a bad state.

Closes https://github.com/ppy/osu/issues/17659.
2022-04-06 16:46:53 +09:00
Dean Herbert
2b8a5833dd Fix back-to-front conditional check 2022-04-06 15:13:02 +09:00
Dean Herbert
552ec5282f Change WorkingBeatmap.GetVirtualTrack to use length provided by BeatmapInfo
A lot of tests are using test resources that populate the length field,
but do not populate hitobjects. The general expectation is that
components should be using the cached length in cases where hitobjects
are not relevant, but `GetVirtualTrack` was doing its own local
calculation.

This could cause tests to fail due to `MusicController` changing track
in the background.
2022-04-06 14:51:15 +09:00
Dean Herbert
f795f77cf9 Add missing newline 2022-04-06 14:00:54 +09:00
Dean Herbert
c540810943
Merge branch 'master' into fix-multiplayer-unobserved 2022-04-06 11:33:10 +09:00
Dean Herbert
01da3924cc Simplify IsCurrentScreen check to only apply to relevant call 2022-04-06 11:32:35 +09:00
Perry MacMurray
2525ec0d18 Switch 24H toggle from UI settings to language settings 2022-04-05 17:07:58 -04:00
Perry MacMurray
9d475f7b33 Add config in settings for forcing 24H time, determines default off CurrentCulture 2022-04-05 16:21:28 -04:00
Bartłomiej Dach
9c91e6d8f5
Merge branch 'master' into mod-overlay/full-screen 2022-04-05 21:29:40 +02:00
Perry MacMurray
74706f72e6 Add 12-hour display setting (TODO add toggle) 2022-04-05 15:10:55 -04:00
Dean Herbert
ac799aaf7a Add missing newline 2022-04-05 19:25:47 +09:00
Dean Herbert
32daf64a31 Use newly exposed framework helper function to find closest parent 2022-04-05 19:24:34 +09:00
Dean Herbert
631aa2a6ec Remove left padding to allow left-most column to exist further to the.. left 2022-04-05 18:44:25 +09:00
Dean Herbert
54715885af Adjust animation metrics slightly 2022-04-05 18:41:01 +09:00
Dean Herbert
7a1820e6bb Fix multiplier display resetting transformations 2022-04-05 18:40:48 +09:00
Dean Herbert
9fdeb20537 Animate individual ModColumns during togle of oerlay 2022-04-05 18:27:34 +09:00
Dean Herbert
901032bfa2 Animate multiplier display 2022-04-05 18:25:27 +09:00
Dan Balasescu
7623f3b90b
Merge branch 'master' into skin-editor-import-at-cursor 2022-04-05 17:39:11 +09:00
Dan Balasescu
2b59f76b2d
Merge pull request #17596 from peppy/skin-editor-sprites
Allow importing sprites into a skin via drag-and-drop
2022-04-05 17:38:58 +09:00
Dean Herbert
497e5e3a36 Slightly adjust scroll handling and also apply to ModSettingsContainer 2022-04-05 17:19:33 +09:00
Dean Herbert
a408776734 Limit FillFlow of columns to applicable direction 2022-04-05 17:15:05 +09:00
Dean Herbert
388322cd61 Speed up customisation panel toggle a bit 2022-04-05 16:56:24 +09:00
Dean Herbert
58e9147b12 Simplify and better comment nested scroll conditionals 2022-04-05 16:48:25 +09:00
Dan Balasescu
2ec15a1ebe Fix lookup through transformers 2022-04-05 16:47:15 +09:00