1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

46615 Commits

Author SHA1 Message Date
Dean Herbert
782191c410 Merge branch 'realm-ruleset-setting-short-name' into realm-ruleset-keybinding-short-name 2021-11-23 17:48:48 +09:00
Dean Herbert
b1b6723826 Add xmldoc and verbatim string markers 2021-11-23 17:47:43 +09:00
Dean Herbert
505fede44d Pass the full EF context rather than a legacy RulesetStore 2021-11-23 17:40:20 +09:00
Dean Herbert
0989d6a92e Merge branch 'realm-ruleset-setting-short-name' into realm-ruleset-keybinding-short-name 2021-11-23 14:55:40 +09:00
Dean Herbert
f264b128c2 Merge branch 'master' into realm-ruleset-setting-short-name 2021-11-23 14:55:36 +09:00
Dan Balasescu
8c24d6eb76
Merge pull request #15752 from peppy/rename-debug-namespace
Rename `Debug` namespace to avoid collisions
2021-11-23 13:39:47 +09:00
Dean Herbert
feb983d5bd Rename Debug namespace to avoid collisions 2021-11-23 13:09:41 +09:00
Dean Herbert
53d6b3c402 Merge branch 'realm-ruleset-setting-short-name' into realm-ruleset-keybinding-short-name 2021-11-23 11:49:13 +09:00
Dean Herbert
1f321e2910 Run EF migrations earlier to ensure it is complete before usage 2021-11-23 11:48:58 +09:00
Dan Balasescu
ae1ae45df1
Merge pull request #15734 from peppy/realm-beatmap-file-relation
Add helper property to access a realm beatmap's beatmap file
2021-11-23 11:13:59 +09:00
Dean Herbert
119ac19f86
Merge branch 'master' into realm-beatmap-file-relation 2021-11-23 10:20:22 +09:00
Dean Herbert
e580fc5abc
Merge pull request #15735 from peppy/remove-ruleset-info-inheritance
Remove subclassing of `RulesetInfo`
2021-11-23 10:18:32 +09:00
Bartłomiej Dach
1ec5dd2cdf
Merge branch 'master' into realm-beatmap-file-relation 2021-11-22 21:53:08 +01:00
Bartłomiej Dach
d9db3b9e78
Merge pull request #15736 from peppy/ruleset-use-short-name
Use `Ruleset`'s `ShortName` for mod caching purposes
2021-11-22 21:37:45 +01:00
Dan Balasescu
fba9e360a1
Merge branch 'master' into ruleset-use-short-name 2021-11-22 23:56:34 +09:00
Dan Balasescu
7ce5cb6162
Merge pull request #15739 from peppy/realm-migration-ordering
Fix realm applying migrations from one version too early
2021-11-22 23:52:50 +09:00
Dan Balasescu
29829cd29d
Merge pull request #15738 from peppy/preferred-ruleset-short-name
Store preferred ruleset to configuration using `ShortName` instead of `ID`
2021-11-22 23:51:47 +09:00
Dan Balasescu
743fe4cef3
Merge pull request #15737 from peppy/use-equality-comparison-beatmap-carousel-tests
Use `Equals` in carousel tests for better realm compatibility
2021-11-22 23:48:50 +09:00
Dean Herbert
6c36770eb3 Add back allowance for tests scenes using empty ShortName 2021-11-22 21:41:09 +09:00
Dean Herbert
d94b27a8a2 Switch realm ruleset key bindings to use ruleset's ShortName as key 2021-11-22 18:52:30 +09:00
Dean Herbert
329bae50b0 Switch realm ruleset configuration to use ruleset's ShortName as key 2021-11-22 18:52:00 +09:00
Dean Herbert
ca26b6c540 Provide RealmContextFactory with the EF RulesetStore for migration purposes 2021-11-22 18:51:44 +09:00
Dean Herbert
d2062ff97f Reformat realm migrations list for legibility 2021-11-22 18:47:18 +09:00
Dean Herbert
361cb78880 Fix realm applying migrations from one version too early 2021-11-22 18:46:46 +09:00
Dean Herbert
f1926c6d27 Store preferred ruleset to configuration using ShortName instead of ID 2021-11-22 17:45:31 +09:00
Dean Herbert
001f7c36f3 Use Equals in carousel tests for better realm compatibility 2021-11-22 17:20:21 +09:00
Dean Herbert
377ba2673a Use Ruleset's ShortName for mod caching purposes 2021-11-22 16:52:54 +09:00
Dean Herbert
1020fb7323
Merge pull request #15733 from smoogipoo/fix-queue-binding
Fix queue mode dropdown not updated on change
2021-11-22 16:46:22 +09:00
Dean Herbert
a8bc1ab052 Attempt to fix fody issues by ignoring new property 2021-11-22 16:45:55 +09:00
Dean Herbert
cb5b6911e6 Seal RulesetInfo and remove virtual methods 2021-11-22 16:39:26 +09:00
Dean Herbert
b9923e5396 Remove subclassing of RulesetInfo 2021-11-22 16:39:17 +09:00
Dean Herbert
1cdfa6d9a0 Add helper property to access a realm beatmap's beatmap file 2021-11-22 15:30:11 +09:00
Dean Herbert
ff13a98077 Reformat realm migrations list for legibility 2021-11-22 15:23:16 +09:00
Dan Balasescu
f64d20ed71 Fix APIRoom queue mode not updated on change 2021-11-22 13:46:01 +09:00
Dean Herbert
4dd86f8619
Merge pull request #15640 from smoogipoo/multi-queueing-modes
Add ability to change multiplayer queue modes
2021-11-22 13:02:14 +09:00
Dean Herbert
bbb3abbc61
Merge branch 'master' into multi-queueing-modes 2021-11-22 12:32:47 +09:00
Dean Herbert
3426492000
Merge pull request #15529 from bdach/beatmap-card/download-button
Implement behaviour of beatmap card download button
2021-11-22 11:54:53 +09:00
Dan Balasescu
f3ba62d2c2 Add xmldoc to serverSidePlaylist 2021-11-22 11:26:41 +09:00
Dan Balasescu
cad6d1d25d Adjust test to match new logic 2021-11-22 11:20:19 +09:00
Dan Balasescu
10dc08a855 Store server-side playlist instead of mutating client-side version 2021-11-22 11:18:21 +09:00
Dan Balasescu
53dbbd6d64 Compare playlist item IDs instead in tests 2021-11-22 11:17:32 +09:00
Dan Balasescu
6420971660 Adjust test client with new queue-changing logic 2021-11-22 11:10:10 +09:00
Dan Balasescu
4b498c7bd6 Merge branch 'master' into multi-queueing-modes 2021-11-22 07:46:45 +09:00
Bartłomiej Dach
975744d26c
Remove no longer used [Cached] attribute 2021-11-21 13:19:16 +01:00
Dean Herbert
c0962b1c4f
Merge branch 'master' into beatmap-card/download-button 2021-11-21 20:04:26 +09:00
Dean Herbert
0641d5dddd
Merge pull request #15707 from bdach/fix-working-beatmap-wrong-exception-type
Clean up cancellation handling in `WorkingBeatmap.GetPlayableBeatmap()`
2021-11-21 20:02:04 +09:00
Bartłomiej Dach
aaf3f3854e
Merge branch 'master' into fix-working-beatmap-wrong-exception-type 2021-11-21 11:32:29 +01:00
Bartłomiej Dach
bb8e8bc4f0
Use consistent type for mod collection in all overloads 2021-11-21 11:30:45 +01:00
Dean Herbert
8c72f4843d
Merge pull request #15684 from frenzibyte/fix-ios-online
Fix MessagePack workaround formatter potentially initializing on iOS
2021-11-21 16:02:08 +09:00
Dean Herbert
63642450a4
Merge branch 'master' into fix-working-beatmap-wrong-exception-type 2021-11-21 15:50:07 +09:00