1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 05:33:21 +08:00
Commit Graph

52185 Commits

Author SHA1 Message Date
vunyunt
29b259ccac
Merge branch 'ppy:master' into colour-rework 2022-06-06 16:49:08 +08:00
vun
07d3a7bd2e Fix logic error, minor stamina changes 2022-06-06 16:11:26 +08:00
Dean Herbert
8189820bf9
Merge pull request #18547 from smoogipoo/multiplayer-test-clone-room
Isolate "server-side" multiplayer rooms in testing
2022-06-06 14:24:10 +09:00
Dean Herbert
7facbc9b28
Merge branch 'master' into multiplayer-test-clone-room 2022-06-06 13:47:16 +09:00
vun
bfada36554 Merge branch 'taiko-evaluators' into colour-rework 2022-06-06 12:45:48 +08:00
vun
3dd0c4aec8 [WIP] Colour rework 2022-06-06 12:42:49 +08:00
Dean Herbert
6516e92128
Merge pull request #18576 from peppy/update-framework
Update framework
2022-06-05 13:45:12 +09:00
Dean Herbert
f1af3205ca Update framework 2022-06-05 13:15:05 +09:00
Dan Balasescu
b897e1464f
Merge pull request #18462 from frenzibyte/fix-timeline-zooming
Fix timeline objects disappearing prematurely on wide-screens
2022-06-05 11:49:44 +09:00
Salman Ahmed
47d2bd2a8d
Merge pull request #18566 from peppy/update-framework
Update framework
2022-06-04 16:56:59 +03:00
Dean Herbert
8ad588d927 Update framework 2022-06-04 22:12:53 +09:00
Dean Herbert
4d0c3fcee2
Merge pull request #18556 from frenzibyte/default-legacy-spinner-approach-circle
Fix spinner approach circle displaying on default legacy skin
2022-06-04 15:30:34 +09:00
Dean Herbert
462e5365d1
Merge pull request #18561 from Joehuu/icon-pill-tooltips
Add tooltips to beatmap card icon pills
2022-06-04 15:06:50 +09:00
Joseph Madamba
30cf6bffad Add tooltips to beatmap card icon pills 2022-06-03 21:41:52 -07:00
Dean Herbert
2a8a4ba4c0
Merge pull request #18560 from Joehuu/fix-some-localisations
Fix some incorrect web localisation usages and casing
2022-06-04 13:37:05 +09:00
Joseph Madamba
4b54fedd88 Add back hide common string using new ToSentence() extension method 2022-06-03 20:09:20 -07:00
Joseph Madamba
58c8562cb0 Fix username placeholder text casing and missing localisation on registration form 2022-06-03 20:09:20 -07:00
Joseph Madamba
b342aad24a Revert/fix some incorrectly used sorting localisation 2022-06-03 19:56:33 -07:00
Salman Ahmed
fe96e15b1b Update spinner approach circle to handle LegacySkinTransformer 2022-06-04 01:15:39 +03:00
Salman Ahmed
045e044637 Expose LegacySkinTransformer's underlying skin for pattern-matching 2022-06-04 01:14:42 +03:00
Dean Herbert
45451178df
Merge pull request #18548 from nekodex/sfx-consistency
SFX consistency pass
2022-06-04 02:00:18 +09:00
Jamie Taylor
396a566a0e
Add some randomness to click samples 2022-06-03 22:33:11 +09:00
Jamie Taylor
6115275bc2
Use 'default' sampleset for toolbar and repurpose 'toolbar' select sample temporarily 2022-06-03 22:33:06 +09:00
Jamie Taylor
2878bb592f
Use more appropriate sounds for certain components 2022-06-03 22:32:12 +09:00
Jamie Taylor
365819865e
Remove 'submit' sample usages 2022-06-03 22:31:35 +09:00
Dean Herbert
f68df1518f
Merge branch 'master' into multiplayer-test-clone-room 2022-06-03 22:29:39 +09:00
Dan Balasescu
fcf51a6f51
Merge pull request #18530 from peppy/add-cloen-button
Change text on timing group add button when it is going to clone instead
2022-06-03 22:23:04 +09:00
Dan Balasescu
725a4dd9f4
Merge pull request #18545 from peppy/web-request-canceled-fix
Fix web requests potentially being performed after cancelled
2022-06-03 21:32:24 +09:00
Dan Balasescu
3df4d1b0e6 Fix incorrect HasPassword value for returned rooms 2022-06-03 21:17:48 +09:00
Dan Balasescu
06ac3c1ad3 Make MultiplayerClient update CurrentPlaylistItem 2022-06-03 21:17:23 +09:00
Dan Balasescu
41ff170b60 Fix playlist IDs not being returned 2022-06-03 21:12:09 +09:00
Dan Balasescu
77289c7224 Fix inability to serialise-then-deserialise playlist items 2022-06-03 20:36:12 +09:00
Dan Balasescu
646f5f0f33 Isolate "server-side" multiplayer rooms in testing 2022-06-03 19:17:34 +09:00
Dan Balasescu
2aabcf51ae Update framework again 2022-06-03 18:47:19 +09:00
Dean Herbert
538ad1bc98
Merge pull request #18532 from smoogipoo/mania-diffcalc-max-combo
Populate MaxCombo difficulty attribute for osu!mania
2022-06-03 18:19:25 +09:00
Dean Herbert
514dffd49a
Merge pull request #18544 from frenzibyte/macos-borderless-default-mode
Change default window mode to "Borderless" on macOS
2022-06-03 18:18:53 +09:00
Dean Herbert
debd1a59b0
Merge pull request #18539 from frenzibyte/repeating-button-behaviour
Share repeat implementation in `TimingAdjustButton` for timeline zoom buttons
2022-06-03 18:18:23 +09:00
Dan Balasescu
1c738e22ae
Merge pull request #18523 from peppy/tap-button
Add tap for BPM button
2022-06-03 18:11:10 +09:00
Dan Balasescu
b3d4cf0b29
Merge pull request #18546 from peppy/sentry-only-our-errors
Don't report sentry errors from builds targetting a different server
2022-06-03 17:31:16 +09:00
Dean Herbert
cd3edc869c Remove unnecessary nesting of IconButton and update design a touch 2022-06-03 17:00:00 +09:00
Salman Ahmed
cd999cf7ac Fix back-to-front conditional 2022-06-03 10:51:20 +03:00
Salman Ahmed
7b28451e3d Improve warning message for user 2022-06-03 10:50:52 +03:00
Dan Balasescu
902a0a3255 Update max combo test value 2022-06-03 16:50:43 +09:00
Dean Herbert
e779b460e4 Use Component instead of CompositeDrawable 2022-06-03 16:49:08 +09:00
Salman Ahmed
3ad1180c48 Use macOS instead of IsApple for better safety 2022-06-03 10:32:59 +03:00
Salman Ahmed
1a835f0622 Add warning note when running fullscreen on macOS 2022-06-03 10:32:59 +03:00
Dean Herbert
54a32bde44 Don't report sentry errors from builds targetting a different server 2022-06-03 16:29:55 +09:00
Dean Herbert
eb2d822530 Fix web requests potentially being performed after cancelled
Closes https://github.com/ppy/osu/issues/18524.
2022-06-03 16:04:52 +09:00
Dean Herbert
1af51a2b19 Update framework 2022-06-03 16:00:42 +09:00
Dan Balasescu
f1169af627
Merge pull request #18541 from peppy/update-realm
Update realm to latest version
2022-06-03 15:53:44 +09:00