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

54376 Commits

Author SHA1 Message Date
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
Salman Ahmed
789e8b4d8d Fix multi-spectator test updating state after removing user
Removing user triggers `playingUsers.Remove`, but doing so before
updating the state leads to `EndGameplay` being called with `State ==
Playing` rather than `Quit`.
2022-08-06 05:41:26 +03:00
Salman Ahmed
84ef24c341 Fix multi-spectator potentially getting stuck for passed players 2022-08-06 05:41:26 +03:00
Dan Balasescu
9ac322d337
Merge pull request #19587 from peppy/adjust-hit-object-pooling
Adjust pooling to reduce stutters during gameplay on unique hit objects
2022-08-05 21:39:41 +09:00
Dan Balasescu
cf362a6b4f
Merge pull request #19529 from peppy/locally-modified-pill
Show "locally modified" pill when local modifications have been made
2022-08-05 21:12:13 +09:00
Dan Balasescu
6afff72865 Fix CI inspections / refactor to single enumeration 2022-08-05 20:54:10 +09:00
Dan Balasescu
802dc90cb1 Adjust using directives for vertices 2022-08-05 20:37:33 +09:00
Dan Balasescu
c4b9b2a14b Merge branch 'master' into irenderer-glwrapper 2022-08-05 20:35:06 +09:00
Dean Herbert
4544df5978 Leave client.realm around to handle pull requests without this change merged 2022-08-05 18:27:29 +09:00
Dean Herbert
ad3d00b1dc Don't add version suffixes when running unit tests 2022-08-05 18:23:41 +09:00
Dean Herbert
a682a823f4 Fix test failures where Beatmap is not provided 2022-08-05 18:20:37 +09:00
Dean Herbert
9a4d0494de Adjust various pooling defaults to better handle more intense beatmaps 2022-08-05 18:09:07 +09:00
Dean Herbert
8ae5429602 Adjust slider pooling based on beatmap
Handles edge cases like mentioned in https://github.com/ppy/osu/issues/19585.
2022-08-05 18:08:05 +09:00
Dean Herbert
3c84b1a389 Change order of application to use original client.realm last 2022-08-05 17:48:51 +09:00
Dean Herbert
84a3fbd25c Version realm files for debug executions
To make it easier for developers to test out pull requests which bump
the realm schema version, realm files are now stored with the schema
version in the filename.

Note that this means any changes made to a newer version will not be
applied to previous ones.
2022-08-05 17:36:49 +09:00
Dan Balasescu
a81a2517b2
Merge pull request #19583 from peppy/fix-preview-track-disposal
Fix `PreviewTrack`s not being disposed correctly
2022-08-05 15:16:22 +09:00
Dean Herbert
94ec653420 Add same load-cancel safeties to ensure tracks are disposed in card PlayButton 2022-08-05 14:26:01 +09:00
Dean Herbert
7c952f8069 Add more test coverage of locally-modified state change 2022-08-05 14:25:10 +09:00
Dean Herbert
6823282604 Fix PlayButton potentially not disposing an unused PreviewTrack during load 2022-08-05 14:15:27 +09:00
Dean Herbert
786af81274 Fix PreviewTrack not disposing its owned audio Track 2022-08-05 14:15:01 +09:00