1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Commit Graph

48989 Commits

Author SHA1 Message Date
Dean Herbert
954ae60b81
Merge branch 'master' into copy-existing-difficulty 2022-02-16 08:55:12 +09:00
Dan Balasescu
3cb123619d
Merge pull request #16843 from peppy/net6
Update desktop projects to target .NET 6
2022-02-16 01:05:38 +09:00
Dan Balasescu
ea5bb46fb8
Merge branch 'master' into net6 2022-02-16 00:40:04 +09:00
Dan Balasescu
6e99fe04c3
Revert more NUnit test adapter bumps 2022-02-16 00:39:43 +09:00
Dean Herbert
9b7cc632c0
Merge pull request #16876 from smoogipoo/remove-playlistitem-ruleset-mods
Remove ruleset and mod bindables from PlaylistItem
2022-02-15 18:05:53 +09:00
Dean Herbert
a8f09a8676
Merge branch 'master' into remove-playlistitem-ruleset-mods 2022-02-15 17:40:39 +09:00
Dan Balasescu
64c14c8fc8
Merge pull request #16877 from peppy/ef-realm-migration-test
Add test coverage of EF to Realm migration process
2022-02-15 17:39:53 +09:00
Dan Balasescu
03106e846c Fix test failures due to async mod icon loads 2022-02-15 17:15:00 +09:00
Dean Herbert
d79845fb1d Revert NUnit3TestAdaptor (again)
Console output is still broken. See
https://github.com/ppy/osu/runs/5196023462?check_suite_focus=true.
2022-02-15 17:06:34 +09:00
Dean Herbert
b1cf014dc2 Add test coverage of EF to Realm migration process 2022-02-15 17:00:17 +09:00
Dean Herbert
f03de16ee5 Add a test EF database
Created on d8a23aad4 (just before skins were migrated to realm).

This contains:
- 2 beatmap sets (intro and disco prince)
- 1 score (set on disco prince using autopilot/DT)
- 1 skin (haxwell)

- 322 named files (from skin)
- 5 named files (from beatmaps)

- 270 total file infos
2022-02-15 16:56:00 +09:00
Dan Balasescu
5b765581d8 Fix free mod selection not showing allowed mods 2022-02-15 16:28:15 +09:00
Dan Balasescu
efeba30b9f Remove ruleset and mod bindables from PlaylistItem 2022-02-15 16:28:15 +09:00
Dean Herbert
2c3e50a450 Update package references in xamarin props files 2022-02-15 15:46:25 +09:00
Dean Herbert
334fe1f120 Add AsSplitQuery specification to avoid optimisation recommendation log messages 2022-02-15 15:23:17 +09:00
Dean Herbert
8ec28dc8bc Update OsuDbContext in line with EF changes 2022-02-15 15:19:50 +09:00
Dean Herbert
28b45fa899 Add assertions against null reference for connection usages 2022-02-15 15:19:50 +09:00
Dean Herbert
60153bb69d Update nuget packages to highest usable versions
EF packages are intentionally pinned to 5.0.14 as higher versions no
longer support `netstandard2.1`, which we require for xamarin projects.
2022-02-15 15:19:23 +09:00
Salman Ahmed
f5d0eb41cb Update further ChangeFocus usages 2022-02-15 02:42:39 +03:00
Dean Herbert
4c8018a675
Merge pull request #16574 from frenzibyte/expandable-controls
Abstractify `ExpandingButtonContainer` and support contraction of settings controls
2022-02-15 08:29:55 +09:00
Bartłomiej Dach
e45a2ae0fc
Restructure difficulty copy flow to adapt to latest changes 2022-02-14 22:02:37 +01:00
Bartłomiej Dach
6221447164
Append copy suffix on creating copy of difficulty 2022-02-14 20:19:12 +01:00
Bartłomiej Dach
1685e214d3
Adjust test coverage to cover desired copy naming scheme 2022-02-14 19:59:54 +01:00
Bartłomiej Dach
40cfee3421
Explicitly reset online ID and beatmap status on copy 2022-02-14 19:54:40 +01:00
Bartłomiej Dach
7e75fa7117
Revert "Change BeatmapInfo copy logic to be opt-in rather than opt-out"
This reverts commit 5dabc9282c.
2022-02-14 19:52:08 +01:00
Dean Herbert
db74a226c0 Fix test regression due to mouse overlapping settings overlay 2022-02-15 02:54:45 +09:00
Bartłomiej Dach
4bd58cfde1
Update one more custom transform with BorderColour type change 2022-02-14 18:52:19 +01:00
Dean Herbert
8da0800d7f Update ChangeFocus usage in line with framework changes 2022-02-15 02:47:35 +09:00
Dean Herbert
02f58a82fc Use WaitSafely() in tests where it was not already being used 2022-02-15 02:35:08 +09:00
Dean Herbert
b581ca14cc Update usages in line with BorderColour type change 2022-02-15 02:32:38 +09:00
Dean Herbert
9ad7b5d51c Remove no longer required NoWarn spec 2022-02-14 22:52:30 +09:00
Dean Herbert
9b7d9d42bc Update reference to NetAnalyzers 2022-02-14 22:48:04 +09:00
Dean Herbert
70ba6fb7dc Update .NET version in README 2022-02-14 22:35:30 +09:00
Dean Herbert
c5019fefb0 Update CI runs to target net6.0 2022-02-14 22:35:08 +09:00
Dean Herbert
e304c031dc Update framework 2022-02-14 22:06:37 +09:00
Dean Herbert
5b30921cbf Merge branch 'master' into net6 2022-02-14 22:06:35 +09:00
Dean Herbert
e324287f79 Reduce expansion delay on ExpandingButtonContainer
Felt too long.
2022-02-14 18:08:17 +09:00
Dean Herbert
3aa5908de8 Remove unused using statement 2022-02-14 18:01:56 +09:00
Dean Herbert
b9d9fc56af Move files to UI namespace 2022-02-14 17:51:39 +09:00
Dean Herbert
80ba06b0e3
Merge branch 'master' into expandable-controls 2022-02-14 16:57:45 +09:00
Dan Balasescu
fdddeb7ed2
Merge pull request #16856 from PercyDan54/relax-ignore-zero-length-spinner
Ignore short spinners for Relax mod
2022-02-14 14:36:46 +09:00
Bartłomiej Dach
5dabc9282c
Change BeatmapInfo copy logic to be opt-in rather than opt-out 2022-02-13 19:04:11 +01:00
Bartłomiej Dach
13abc392bd
Add failing test coverage for not copying online properties 2022-02-13 18:54:52 +01:00
Bartłomiej Dach
ecd6a68c6f
Clear hash when creating copy of existing difficulty 2022-02-13 14:01:23 +01:00
Bartłomiej Dach
90c48de9f8
Add failing test coverage for save of copied beatmap keeping old beatmap file 2022-02-13 14:01:23 +01:00
Bartłomiej Dach
6fd663a718
Apply some renames to convey difference between creation options better 2022-02-13 14:01:23 +01:00
Bartłomiej Dach
a144d6f8d6
Fix beatmap skin properties not copying 2022-02-13 14:01:22 +01:00
Bartłomiej Dach
1292722a00
Add failing test coverage for correct combo colour copy 2022-02-13 14:01:22 +01:00
Bartłomiej Dach
1bf5375e74
Fix BeatmapInfo-associated member not copying 2022-02-13 14:01:21 +01:00
Bartłomiej Dach
fd1c8c3614
Add failing test coverage for correct beatmap difficulty copy 2022-02-13 14:01:21 +01:00