1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 13:27:23 +08:00
Commit Graph

54198 Commits

Author SHA1 Message Date
Andrew Hong
a705c4f5d2 Moved ShowProfile to the bottom of the enum 2022-08-09 03:17:55 -04:00
Andrew Hong
04108a749e Rename translation key 2022-08-09 03:03:14 -04:00
Andrew Hong
ededaed5ef Remove unused import 2022-08-09 02:58:28 -04:00
Andrew Hong
3473347f35 Lowercase "p" 2022-08-09 02:56:12 -04:00
Andrew Hong
f65b7ef058 Add keybind for showing profile 2022-08-09 02:49:53 -04:00
Bartłomiej Dach
fbd645f06e
Merge pull request #19638 from peppy/fix-collection-import-notification
Fix collection import not showing progress notification
2022-08-08 21:37:53 +02:00
Bartłomiej Dach
e77f47e489
Merge branch 'master' into fix-collection-import-notification 2022-08-08 21:05:48 +02:00
Dean Herbert
3b79cb6fce
Merge pull request #19640 from peppy/mod-preset-column-task-logic 2022-08-09 03:14:28 +09:00
Bartłomiej Dach
f21a51aa24
Simplify mirror copy of task logic in ModColumn 2022-08-08 19:20:50 +02:00
Bartłomiej Dach
00333fb0d2
Change ?? false test to == true for legibility 2022-08-08 19:19:13 +02:00
Dean Herbert
070d156e89 Simplify task logic in ModPresetColumn 2022-08-08 16:13:52 +09:00
Dean Herbert
c2b7598203
Merge pull request #19637 from its5Q/fps-counter-fix
Fix FPS counter disappearing when hovered over
2022-08-08 15:33:23 +09:00
Dean Herbert
6459dbd9e5 Fix collection import not showing progress notification 2022-08-08 14:56:16 +09:00
its5Q
68e7000620 Fix FPS counter disappearing when hovered over 2022-08-08 15:52:47 +10:00
Dean Herbert
0e232d3926
Merge pull request #19560 from smoogipoo/irenderer-glwrapper
Apply `IRenderer` changes
2022-08-08 14:07:46 +09:00
Dean Herbert
237f72efbc Add missing null check on AudioManager 2022-08-08 13:31:57 +09:00
Dean Herbert
a8dee17513 Fix missing DummyRenderer in skin resources tests 2022-08-08 13:06:01 +09:00
Dean Herbert
f1691882e2 Fix incorrect argument passing to ToMod 2022-08-08 12:56:18 +09:00
Dean Herbert
8b990ef3c9 Update framework 2022-08-08 12:31:55 +09:00
Dean Herbert
e1189da824 Merge branch 'master' into irenderer-glwrapper 2022-08-08 12:31:53 +09:00
Dean Herbert
0537c471dc
Merge pull request #19582 from smoogipoo/apimod-json-cleanup
Don't serialise empty mod settings
2022-08-08 11:49:08 +09:00
Dean Herbert
6011b76eed
Merge pull request #19635 from frenzibyte/possible-null-assignment 2022-08-08 10:25:11 +09:00
Salman Ahmed
f75dced305 Fix possible null assignment inspection in TestScenePreviewTrackManager 2022-08-08 02:00:24 +03:00
Dean Herbert
21f6fefcde
Merge pull request #19622 from bdach/mod-overlay/integration-in-solo
Add mod preset column to solo mod select overlay
2022-08-08 02:32:13 +09:00
Dean Herbert
8206507112
Merge branch 'master' into mod-overlay/integration-in-solo 2022-08-08 01:04:29 +09:00
Dean Herbert
c622b31f8d
Merge pull request #19621 from bdach/mod-overlay/mod-preset-selection-logic
Implement selection logic for mod preset panels
2022-08-08 01:03:56 +09:00
Bartłomiej Dach
7d6efaebbe
Add maintenance settings section for mod presets 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
839409d7ac
Add preset column to solo mod select overlay 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
b318bbd5e6
Allow non-homogenous column types in mod select overlay 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
0287c49ca8
Implement user selection logic for mod presets 2022-08-07 16:20:20 +02:00
Bartłomiej Dach
de64b83532
Add test coverage for desired user selection behaviour 2022-08-07 16:20:16 +02:00
Bartłomiej Dach
b1dcd7821c
Automatically toggle preset panels if selected mods match 2022-08-07 15:30:20 +02:00
Bartłomiej Dach
25daaa56e2
Add test coverage for desired external selection behaviour 2022-08-07 15:30:20 +02:00
Dean Herbert
c81b3ee9e9
Merge pull request #19613 from bdach/mod-overlay/delete-preset
Add flow for deleting mod presets
2022-08-07 15:47:58 +09:00
Dean Herbert
c31e257a1f Clean up pending deletion presets on startup 2022-08-07 15:16:33 +09:00
Dean Herbert
4a95638756
Merge branch 'master' into mod-overlay/delete-preset 2022-08-07 12:34:25 +09:00
Dean Herbert
5946124278
Merge pull request #19612 from bdach/mod-overlay/common-delete-dialog
Unify implementations of deletion dialogs
2022-08-07 12:18:03 +09:00
Bartłomiej Dach
6f6beddab5
Add test coverage for mod preset deletion flow 2022-08-06 21:58:55 +02:00
Bartłomiej Dach
9b3183b2b4
Implement mod preset deletion flow 2022-08-06 21:58:55 +02:00
Bartłomiej Dach
26b9adbe0c
Adjust collection deletion test to match new expectations 2022-08-06 21:07:21 +02:00
Bartłomiej Dach
a0d093be5c
Extract common implementation of delete dialog 2022-08-06 21:04:12 +02:00
Dean Herbert
ca7aa7d21d
Merge pull request #19323 from LukynkaCZE/add-missing-icons-to-recent-profile-section
Add missing icons to UserProfileRecentSection
2022-08-07 02:37:43 +09:00
Bartłomiej Dach
ab1b38242f
Reorder enum cases to match web order 2022-08-06 18:34:30 +02:00
Bartłomiej Dach
6a9c30c47a
Fix some more wrong icon colours 2022-08-06 18:34:00 +02:00
Bartłomiej Dach
2ba127b6fc
Fix wrong icon for approval event 2022-08-06 18:30:49 +02:00
Bartłomiej Dach
f1e0dd2da3
Match approval type-dependent icon appearance with web 2022-08-06 18:29:24 +02:00
Bartłomiej Dach
f3ecd73e0b
Add references to web source in recent activity icon 2022-08-06 18:23:15 +02:00
Bartłomiej Dach
cc353b872c
Add test coverage for other approval events 2022-08-06 18:21:57 +02:00
LukynkaCZE
3000d9b9c6 Inline everything in RecentActivityIcon 2022-08-06 07:16:34 +02:00
LukynkaCZE
bd27995c71
Merge branch 'ppy:master' into add-missing-icons-to-recent-profile-section 2022-08-06 05:55:51 +02:00