1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 01:47:25 +08:00
Commit Graph

58070 Commits

Author SHA1 Message Date
Bartłomiej Dach
ce8a8b5433
Merge branch 'master' into screenshot-safety 2023-01-09 19:56:06 +01:00
Salman Ahmed
3014b60fd5
Merge branch 'master' into fix-channel-init-request-pile-up 2023-01-09 21:39:52 +03:00
Salman Ahmed
98390ea2a8 Fix condition flipped 2023-01-09 21:33:08 +03:00
Salman Ahmed
dbc19777e0 Move stable import buttons under "debug" section 2023-01-09 21:22:21 +03:00
Dean Herbert
96a100d428
Merge pull request #22094 from peppy/pause-imports-during-gameplay 2023-01-10 02:54:08 +09:00
mk56-spn
d6f60db234 Add the ability to toggle the visibility of the main bar in BarHitErrorMeter.cs 2023-01-09 18:51:51 +01:00
mk56-spn
69260ca3c3 remove unnecessary usages of nullable forgiveness, add asserts for debugging 2023-01-09 18:36:55 +01:00
Bartłomiej Dach
6027e7cc4e
Fix one more missed related symbol 2023-01-09 18:22:49 +01:00
Salman Ahmed
5ee0665eac
Merge branch 'master' into pause-imports-during-gameplay 2023-01-09 20:09:17 +03:00
Salman Ahmed
8a05223591 Check cancellation token if importer was resumed while sleeping 2023-01-09 20:07:46 +03:00
Salman Ahmed
a1fbfe4b8b Specifiy importer name during pause/resume in logs 2023-01-09 19:53:41 +03:00
Bartłomiej Dach
0026861bd4
Merge branch 'master' into user-profile/decouple-from-api-user 2023-01-09 17:47:59 +01:00
Bartłomiej Dach
4dec3cae57
Rename UserProfileData-related symbols 2023-01-09 17:46:08 +01:00
Bartłomiej Dach
fdf0d4bd62
Rename UserProfile{ -> Data} 2023-01-09 17:37:28 +01:00
Dean Herbert
e35f63c001 Ensure screenshot filenames are unique by locking over file creation 2023-01-10 01:37:16 +09:00
Dean Herbert
741723a510
Merge pull request #22093 from LittleEndu/songs-folder-check
Change message in first-run setup to only check final location of Songs folder
2023-01-10 01:21:21 +09:00
Dean Herbert
811a562608 Don't use bindables to avoid potential cross-usage contamination 2023-01-10 01:10:20 +09:00
Endrik Tombak
44e9fb638c Merge branch 'master' of https://github.com/ppy/osu into songs-folder-check 2023-01-09 14:53:40 +02:00
Endrik Tombak
f5c8ba420c Revert message change 2023-01-09 14:53:16 +02:00
Dean Herbert
9d97c1a0bd
Merge branch 'master' into variable_BPM_counter 2023-01-09 19:26:34 +09:00
Dean Herbert
54b2fe9df3
Merge branch 'master' into fix-op-non-current-onexiting 2023-01-09 19:12:42 +09:00
Dean Herbert
c259995766
Merge pull request #21786 from Joehuu/overlay-panels-context-menu
Add context menus to overlay panels/cards
2023-01-09 19:07:25 +09:00
Dean Herbert
07dae7dc21 Merge branch 'master' into overlay-panels-context-menu 2023-01-09 19:04:56 +09:00
Dean Herbert
62ffb4fe78 Pause imports during active gameplay 2023-01-09 18:54:11 +09:00
Endrik Tombak
15eebd1f50 Only show message about Songs folder 2023-01-09 11:47:13 +02:00
Dean Herbert
22d0b34623 Remove flag causing intiialisation to only run once ever 2023-01-09 16:38:37 +09:00
Dean Herbert
07eadba6d3
Merge pull request #21883 from sw1tchbl4d3r/allow_4_3
Allow aspect ratios smaller than the default in taiko
2023-01-09 16:30:19 +09:00
Dean Herbert
4a77105e78 Rename LockPlayfieldAspect and add comment explaining the change 2023-01-09 16:28:09 +09:00
Dean Herbert
13c3d2c254 Fix retry loop for channel initialisation resulting in request pile-up
Closes #22060.
2023-01-09 16:15:31 +09:00
Dean Herbert
d05e84bb55
Merge pull request #22080 from Joehuu/fix-channel-listing-item-overflow
Fix channel listing items overflowing at high ui scaling
2023-01-09 15:35:34 +09:00
Joseph Madamba
f6b1dfc7b0 Fix channel listing items overflowing at high ui scaling 2023-01-08 13:27:10 -08:00
Bartłomiej Dach
2803c98612
Merge pull request #22047 from Feodor0090/wcd-length-fix
Fix `WaveformComparisonDisplay` does not take into account start time of control points
2023-01-08 20:36:35 +01:00
Salman Ahmed
ff48bd68ff
Merge pull request #22052 from Joehuu/fix-player-loader-logo-drag
Fix osu! logo not being draggable on player loader
2023-01-08 22:35:21 +03:00
Salman Ahmed
f2609820c1
Merge branch 'master' into fix-player-loader-logo-drag 2023-01-08 21:48:07 +03:00
Bartłomiej Dach
e08b7c615b
Merge branch 'master' into wcd-length-fix 2023-01-08 19:44:12 +01:00
Bartłomiej Dach
1b735d0970
Merge pull request #22049 from Feodor0090/editor-bg-refresh
Refresh background on file change in editor
2023-01-08 19:43:45 +01:00
Salman Ahmed
7dd0f892c8
Merge branch 'master' into fix-player-loader-logo-drag 2023-01-08 21:29:03 +03:00
mk56-spn
a32c4a64e7 Fix errors in test 2023-01-08 19:18:28 +01:00
mk56-spn
47fb467012 Remove nullable disabling in carousel 2023-01-08 19:02:48 +01:00
Bartłomiej Dach
9fd305a970
Merge branch 'master' into editor-bg-refresh 2023-01-08 18:57:04 +01:00
Bartłomiej Dach
74b11cc8f1
Merge pull request #22055 from Joehuu/beatmap-info-nominators
Display nominators on beatmap set overlay
2023-01-08 15:27:58 +01:00
Bartłomiej Dach
9b68932eb4
Merge branch 'master' into beatmap-info-nominators 2023-01-08 14:35:07 +01:00
Dean Herbert
750b55d9b7 Update other events to have matching return types (and animate more) 2023-01-08 22:28:19 +09:00
Joseph Madamba
bae3a6851b Block hover events behind logo even if action is null 2023-01-07 11:15:51 -08:00
Joseph Madamba
9d32fde592 Mark current nominations and related users as nullable 2023-01-07 11:04:42 -08:00
Joseph Madamba
0f6735564e Move and rename nomination response model to singular 2023-01-07 10:54:48 -08:00
ansel
aaeb43fbb2 Return older file if new one is null 2023-01-07 18:15:57 +03:00
Bartłomiej Dach
06e73594f8
Merge pull request #21650 from cdwcgt/previewTime
Add ability to set preview time in editor
2023-01-07 15:26:34 +01:00
Salman Ahmed
cfdb0e1806
Merge branch 'master' into previewTime 2023-01-07 16:25:53 +03:00
Dean Herbert
9549aefc33
Merge pull request #22056 from frenzibyte/fix-friends-duplication
Fix friends list duplicating after connection failure
2023-01-07 21:00:39 +08:00