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

45618 Commits

Author SHA1 Message Date
Bartłomiej Dach
b0c4fa662d
Merge branch 'master' into long-online-id-score-info 2021-10-30 14:35:30 +02:00
Dan Balasescu
f6c19c9538
Merge pull request #15360 from peppy/beatmap-refactor/difficulty-icons
Update `DifficultyIcon` classes to use `IBeatmapInfo`
2021-10-30 21:32:46 +09:00
Bartłomiej Dach
6e4f7af8d3
Mark IHasOnlineID implementation with region 2021-10-30 14:15:20 +02:00
Bartłomiej Dach
5a8dff0e4e
Merge branch 'master' into beatmap-refactor/difficulty-icons 2021-10-30 14:06:15 +02:00
Dean Herbert
f8aa4c2851
Merge pull request #15352 from bdach/text-flow-parts
Update text flow usages to use `ITextPart`
2021-10-29 22:32:46 +09:00
Dean Herbert
1fd05ab78a Update framework 2021-10-29 18:56:13 +09:00
Dean Herbert
04acc7601c Fix one more missed case 2021-10-29 18:35:15 +09:00
Dean Herbert
07e3ced315 Fix test scene and remove "impossible" nullable coalesce 2021-10-29 18:22:23 +09:00
Dean Herbert
7db8bdfb7c Fix fallback logic not considering case where ruleset is not available
Occurs only in tests.
2021-10-29 18:16:54 +09:00
Dan Balasescu
159a7af556
Merge branch 'master' into beatmap-refactor/difficulty-icons 2021-10-29 18:03:17 +09:00
Dan Balasescu
32f89791c9
Merge pull request #15357 from peppy/beatmap-refactor/beatmap-difficulty-cache
Refactor `BeatmapDifficultyCache` to work with `IBeatmapInfo`
2021-10-29 17:31:14 +09:00
Dean Herbert
be0564f732 Update DifficultyIcon classes to use IBeatmapInfo 2021-10-29 17:05:06 +09:00
Dean Herbert
3598adb344 Fix test implementing old version of class 2021-10-29 17:04:56 +09:00
Dean Herbert
7583435901 Refactor BeatmapDifficultyCache to work with IBeatmapInfo 2021-10-29 16:45:10 +09:00
Bartłomiej Dach
61f0339c1d
Avoid double-adding chunks in link flow container 2021-10-29 06:34:08 +02:00
Bartłomiej Dach
6f863ca204
Adjust game-side text flow containers to part-based model 2021-10-29 06:34:08 +02:00
Dean Herbert
34d4715220 Allow for long online IDs and implement in ScoreInfo 2021-10-29 11:48:36 +09:00
Dan Balasescu
fe86ae51b0
Merge pull request #15349 from peppy/remap-mania-scroll-speed-adjust
Change scroll speed adjust defaults to F3/F4
2021-10-29 11:42:44 +09:00
Dean Herbert
3838fe5c6a Fix typo in variable name 2021-10-29 11:39:15 +09:00
Dean Herbert
8d21f0b04b Add migration to reset conflicting scroll speed key bindings 2021-10-29 11:14:22 +09:00
Dean Herbert
ce29d6fd81 Change scroll speed adjust defaults to F3/F4
Not the most obvious keys, but does match stable expectations so let's
go with it for now.

Rationale for not using +/- is that local audio offset was bound to
those, and people will expect it to be when we get to implementing
eventually.

Also, adjust the scroll speed is a pretty rare thing to do since it's
been constant across beatmaps for years now.
2021-10-29 11:13:07 +09:00
Dean Herbert
7ab68525b4
Merge pull request #15031 from Joehuu/ui-scaling-keybind
Add ability to change ui scaling via keyboard
2021-10-29 01:48:08 +09:00
Bartłomiej Dach
9199f2b337
Merge branch 'master' into ui-scaling-keybind 2021-10-28 18:20:34 +02:00
Dean Herbert
d14421723a
Merge pull request #15341 from peppy/always-unique-test-online-ids
Ensure all test beatmaps have unique OnlineIDs to avoid import conflicts
2021-10-29 00:21:19 +09:00
smoogipoo
c96b07c625 Remove unnecessary/wrong code 2021-10-28 18:24:04 +09:00
smoogipoo
2b3e63470d Merge branch 'master' into always-unique-test-online-ids 2021-10-28 18:23:45 +09:00
Dan Balasescu
6e79a0947a
Merge pull request #15340 from peppy/add-number-setting-source-test
Add visual test for `SettingsNumberBox` usage in settings source context
2021-10-28 18:19:45 +09:00
Dean Herbert
d8d4839e43
Merge pull request #15339 from smoogipoo/fix-test-crash
Fix playlists room creation test crash
2021-10-28 17:28:46 +09:00
Dean Herbert
4f4f2503aa
Merge pull request #15335 from smoogipoo/cleanup-multiplayer-screen-tests
Clean up multiplayer-screen tests by removing intermediate screen
2021-10-28 17:28:26 +09:00
Dean Herbert
c0848486d6 Add missing test coverage for attempt count display 2021-10-28 17:27:16 +09:00
Dean Herbert
8076e22e70 Replace weird import handling 2021-10-28 17:27:16 +09:00
Dan Balasescu
b21f42ec76
Merge branch 'master' into add-number-setting-source-test 2021-10-28 17:25:52 +09:00
Dan Balasescu
e5a7589859
Merge pull request #15317 from peppy/beatmap-refactor/uncontested
Update `UpdateableBeatmapBackgroundSprite` to accept `IBeatmapInfo`
2021-10-28 17:24:49 +09:00
Dan Balasescu
e5107ae0f7
Merge pull request #15338 from peppy/add-progress-notification-icons
Add icons to various progress notification states
2021-10-28 17:24:39 +09:00
Dean Herbert
b096bf6cd1 Ensure all test beatmaps have unique OnlineIDs to avoid import conflicts
The order of operation of imports means that the already-imported
instances are considered most correct (they have usually been populated
using an online source, although that is skipped in tests), so on two
consecutive test imports in a test scene, the second will lose its
online IDs completely.

This aims to ensure that all test beatmaps will have online IDs, which
is the general expected behaviour.
2021-10-28 16:56:31 +09:00
smoogipoo
bacaa9d201 Fix playlists test crash 2021-10-28 16:48:17 +09:00
Dean Herbert
6f5040722a Merge branch 'master' into beatmap-refactor/uncontested 2021-10-28 16:37:26 +09:00
Dean Herbert
1e1f8c472a Add icons to various progress notification states 2021-10-28 16:34:12 +09:00
Dan Balasescu
887f1c2c5c
Merge pull request #15316 from peppy/fix-playlists-room-subscreen-tests
Refactor weird playlist room subscreen tests
2021-10-28 16:31:01 +09:00
Dan Balasescu
f9ca7f5df1
Merge pull request #15319 from peppy/beatmap-refactor/tournament
Remove all usage of `BeatmapInfo` / `BeatmapSetInfo` from tournament mode
2021-10-28 16:26:06 +09:00
Dan Balasescu
8811bf1bec
Merge pull request #15337 from peppy/fix-tournament-writes-empty-ladder-on-serialise-failure
Fix serlialisation failure during ladder saving causing all existing file content to be deleted
2021-10-28 15:51:12 +09:00
Dean Herbert
dce19cf7e4 Add visual test for SettingsNumberBox usage in settings source context 2021-10-28 15:42:06 +09:00
smoogipoo
e2c08fb2e5 Create room by clicking button 2021-10-28 15:41:59 +09:00
smoogipoo
b0b27a47d5 Rename test scene 2021-10-28 15:28:16 +09:00
smoogipoo
cf15282077 Merge branch 'master' into fix-playlists-room-subscreen-tests 2021-10-28 15:26:48 +09:00
Dan Balasescu
44ba4419a2
Merge branch 'master' into beatmap-refactor/tournament 2021-10-28 15:25:34 +09:00
smoogipoo
313f78cbfb Fix non-null inspection 2021-10-28 15:24:44 +09:00
Dean Herbert
f112f189da
Merge pull request #15336 from smoogipoo/upgrade-nvika
Upgrade nvika to 1.0.3
2021-10-28 15:16:06 +09:00
Dean Herbert
56e3a42abe Remove unused using statement 2021-10-28 15:14:29 +09:00
Dean Herbert
a6669a3892 Add mention of why the serialisation happens outside stream usage 2021-10-28 15:04:09 +09:00