1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 13:17:26 +08:00
Commit Graph

29194 Commits

Author SHA1 Message Date
Dean Herbert
06b6bcfd29 Add xmldoc for CreateScoreInfo function for now
I don't actually know how temporary this one is going to be. The usages
are quite deep - ie. converting to a `ScoreInfo` to get a calculated
total score for ordering purposes.
2021-10-29 14:51:07 +09:00
Dean Herbert
f68d6dbc8f Update score submission serialisation tests to use SubmittableScore 2021-10-29 14:32:31 +09:00
Dean Herbert
cd7bd935f6 Remove Statistics from interface until we figure how to properly deserialise 2021-10-29 14:18:10 +09:00
Dean Herbert
3f030cebf4 Remove local score copying in GetScoresRequest to allow APIScoreInfo.Beatmap to be APIBeatmap 2021-10-29 14:14:25 +09:00
Dean Herbert
54073d8a1e Isolate score submissions model and remove serialisation from ScoreInfo 2021-10-29 14:13:43 +09:00
Dean Herbert
1944c255a7 Implement score interfaces 2021-10-29 13:49:30 +09:00
Dean Herbert
49b5de64be Extract interface 2021-10-29 13:41:21 +09:00
Dean Herbert
817369903a Rename API score classes 2021-10-29 13:40:56 +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
414d920ca2 Revert to previous exposure of RoomSubScreen.BeatmapAvailability 2021-10-29 12:02:10 +09:00
Dean Herbert
b252b176d4 Seal implementation and add comment about LoadComplete execution order 2021-10-29 11:59:07 +09:00
Dean Herbert
f3811edb0b Add inline comment explaining usage of RequiresChildrenUpdate override 2021-10-29 11:57:54 +09:00
Dean Herbert
dc44734db2 Simplify null check in ScoreDownloadTracker and remove unnecessary ID check 2021-10-29 11:56:17 +09:00
Dean Herbert
75a088d4f4 Fix variable name mismatch 2021-10-29 11:54:42 +09:00
Dean Herbert
748003b016 Simplify Manager null check to a single pre-check 2021-10-29 11:54:19 +09:00
Dean Herbert
3b095e1626 Merge branch 'master' into beatmap-refactor/download-tracker 2021-10-29 11:50:54 +09:00
Dean Herbert
34d4715220 Allow for long online IDs and implement in ScoreInfo 2021-10-29 11:48:36 +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
Bartłomiej Dach
9199f2b337
Merge branch 'master' into ui-scaling-keybind 2021-10-28 18:20:34 +02:00
smoogipoo
2b3e63470d Merge branch 'master' into always-unique-test-online-ids 2021-10-28 18:23: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
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
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
44ba4419a2
Merge branch 'master' into beatmap-refactor/tournament 2021-10-28 15:25:34 +09:00
smoogipoo
0e293471c2 Clean up multiplayer-screen tests by removing intermediate screen 2021-10-28 14:29:49 +09:00
Dean Herbert
5c7623e68e
Merge pull request #15255 from goodtrailer/node-samples-ilist
Change IHasRepeats.NodeSamples to IList from List
2021-10-28 14:24:26 +09:00
Dean Herbert
aaabaaa5dd
Merge pull request #15320 from smoogipoo/fix-online-play-request-handling
Fix online play request handling in tests
2021-10-28 14:24:00 +09:00
Dean Herbert
3905ecd18b Use retrieval of bindable and tidy up code slightly 2021-10-28 13:09:03 +09:00
Dean Herbert
ad1bd4e48e Merge branch 'master' into ui-scaling-keybind 2021-10-28 13:03:21 +09:00
Dean Herbert
add39fbd4f Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-28 06:24:24 +09:00
Dean Herbert
65a7b6776e Add note regarding OnlineInfo being temporary 2021-10-28 05:50:22 +09:00
Dean Herbert
a9208838a9
Merge pull request #15307 from peppy/playlist-remaining-attempt-display
Show remaining attempts again on playlist screen
2021-10-28 05:28:20 +09:00
Dean Herbert
290f583ae0 Fix incorrect initial state 2021-10-28 00:59:48 +09:00
Dean Herbert
7245baba69 Remove IBeatmapSetOnlineInfo implementation from BeatmapSetInfo to avoid null cases 2021-10-28 00:50:45 +09:00
Dean Herbert
746d6a4c16 Fix some oversights and test failures 2021-10-27 23:42:27 +09:00
Dean Herbert
f014ceaead Update remaining usages of download tracking 2021-10-27 21:00:46 +09:00
Dean Herbert
dd06c617b1 Update OnlinePlayBeatmapAvailabilityTracker in line with new download tracker
The structure here has changed a bit - rather than deriving from the
donwload tracker I moved the additional logic into the callbacks. I
think this feels better?
2021-10-27 21:00:46 +09:00
Dean Herbert
6339064dbd Remove old versions of DownloadTrackingComposite 2021-10-27 21:00:46 +09:00
Dean Herbert
692db9a9ec Remove unnecessary verification flow from score download tracking 2021-10-27 21:00:46 +09:00
Dean Herbert
617e6febb6 Refactor ModelDownloader to allow for different OnlineID matching 2021-10-27 21:00:46 +09:00
Dean Herbert
9015ac6ba8 Implement new version of download tracker 2021-10-27 21:00:46 +09:00
smoogipoo
f3dba49aae Rename room managers 2021-10-27 19:36:32 +09:00
Dean Herbert
db6343c44c Correctly redirect BPM from API to interface 2021-10-27 17:09:51 +09:00
Dean Herbert
40d963fc8a Allow setting of APIBeatmap.Length (and don't serialise twice) 2021-10-27 16:44:21 +09:00
Dean Herbert
f268363924 Update UpdateableBeatmapBackgroundSprite to accept IBeatmapInfo 2021-10-27 16:38:48 +09:00
smoogipoo
85b21174dd Fix online play test request handling 2021-10-27 14:49:50 +09:00
Dean Herbert
95837990f3 Apply some second-pass inspections that appeared after previous changes 2021-10-27 13:09:30 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Bartłomiej Dach
3de994449d
Add support for changing dimensions of difficulty spectrum display 2021-10-26 23:06:52 +02:00
Bartłomiej Dach
1a77e98537
Implement difficulty spectrum display 2021-10-26 23:06:52 +02:00
Jason Won
c633e2e952 only propagate unmodified right click 2021-10-26 16:24:53 -04:00
Jason Won
f64fa65fd5 right click on unselected object shows context menu 2021-10-26 14:52:15 -04:00
Dean Herbert
70f432805e
Merge branch 'master' into ui-scaling-keybind 2021-10-27 01:06:14 +09:00
Dean Herbert
411586bac3 Update resources 2021-10-26 22:12:56 +09:00
Dean Herbert
c15bfb2cf4 Handle bindable changes to fix new playlist creation not showing correct details 2021-10-26 18:19:05 +09:00
Dean Herbert
42d8d4fd38 Add tooltips to start button to explain why it's not clickable 2021-10-26 18:06:08 +09:00
Dean Herbert
1c578f285a Disable playlist start button when attempts have been exhausted 2021-10-26 18:06:08 +09:00
Dean Herbert
bffd9162ba Tint attempt count red when no attempts remain 2021-10-26 18:06:08 +09:00
Dean Herbert
708d40931b Add back remaining attempt display on playlist room screen 2021-10-26 18:06:08 +09:00
Dean Herbert
d5b4c68d3a Merge branch 'master' into fix-slider-path-extension-incorrectness 2021-10-26 17:36:50 +09:00
Dean Herbert
e92def0ba2 Fix LegacyBeatmapEncoder using incorrect path length value 2021-10-26 17:34:52 +09:00
Dan Balasescu
6a6d3a5e8a
Merge pull request #15304 from peppy/fix-editor-new-beatmap-sample-change-crash
Fix editor crash when attempting to change sample/velocity from timeline on new beatmap
2021-10-26 17:13:56 +09:00
Dean Herbert
4cef86dd12
Merge pull request #15301 from jaswon/reverse-slider-symmetric
Fix slider shape not always being maintained when reversing
2021-10-26 16:17:29 +09:00
Dean Herbert
ea55ba7ba9 Remove unused using statement 2021-10-26 16:08:21 +09:00
Dean Herbert
dae7cdc4c5 Ensure HitObject-local control points are non-default after ApplyDefaults
We will probably want to make this whole flow more efficient in the
future, but this should suffice for now.
2021-10-26 16:06:03 +09:00
Dean Herbert
5e5b86a1f4
Merge pull request #15156 from Susko3/use-ShowFileInNativeExplorer
Update usages of `OpenInNativeExplorer` to use `PresentFileExternally` / `PresentExternally`
2021-10-26 15:53:03 +09:00
Dean Herbert
81fee02c2b Fix slider paths being extended even when the last two points are equal 2021-10-26 15:47:59 +09:00
Dan Balasescu
f687ed8599
Merge pull request #15283 from peppy/test-api-beatmap-set
Add ability to make test `APIBeatmapSet`s from test scenes
2021-10-26 15:34:19 +09:00
Dan Balasescu
7b8982c87c
Merge pull request #15302 from peppy/fix-multiplayer-chat-escape-focus
Fix gameplay chat display not losing focus on escape key press
2021-10-26 15:34:05 +09:00
Dan Balasescu
efe6763226
Merge branch 'master' into move-online-beatmap-metrics 2021-10-26 14:24:40 +09:00
Dean Herbert
370775af68 Fix some surrounding code formatting 2021-10-26 14:05:07 +09:00
Dean Herbert
53ff0802cb Merge branch 'master' into use-ShowFileInNativeExplorer 2021-10-26 13:58:30 +09:00
Dean Herbert
26fb9af021 Update framework 2021-10-26 13:58:07 +09:00
Dean Herbert
6c38028d06 Fix gameplay chat display not losing focus on escape key press
Closes #15293.
2021-10-26 13:55:08 +09:00
Dan Balasescu
1e3c84b34b
Merge branch 'master' into use-beatmap-interfaces-more-uncontested 2021-10-26 13:51:55 +09:00
Dan Balasescu
676e7ff2a6
Merge pull request #15287 from peppy/get-beatmap-request-via-interface
Allow API beatmap requests using interface type
2021-10-26 13:50:46 +09:00
Jason Won
a582976851 reversing slider maintains shape 2021-10-26 00:05:46 -04:00
Dean Herbert
d7ac94038a Update GetBeatmapRequest to use AddParameter 2021-10-26 12:05:31 +09:00
Dean Herbert
5d1170aaf4 Remove unnecessary null check 2021-10-26 11:57:51 +09:00
Bartłomiej Dach
a49a1f41cb
Merge branch 'master' into move-online-beatmap-metrics 2021-10-25 20:33:49 +02:00
Bartłomiej Dach
5a03e1736e
Merge branch 'master' into update-beatmap-set-status-pill-appearance 2021-10-25 20:26:49 +02:00
Bartłomiej Dach
6802e9ec10
Remove FixedWidth and add AutoSizeAxes specs to all usages 2021-10-25 20:24:48 +02:00
Dean Herbert
b65d199f6a Fix incorrect length when calling APIBeatmap.ToBeatmapInfo 2021-10-25 17:01:47 +09:00
Dean Herbert
6adb0f068b Fix multiple issues with json serialisation of online info (causing tournament failures) 2021-10-25 16:52:50 +09:00
Dean Herbert
67ef1c40e6 Allow API beatmap requests using interface type 2021-10-25 15:59:40 +09:00
Dean Herbert
2c308f3008 Rename BeatmapMetrics to APIFailTimes 2021-10-25 15:34:41 +09:00
Dean Herbert
4969ab0599 Add forgotten JsonIgnore rules on interface types
Just to avoid them getting serialised as part of the "new" .osu
serialisation format.
2021-10-25 15:32:18 +09:00
Dean Herbert
20baae9094 Move online metrics out of BeatmapInfo model 2021-10-25 15:32:18 +09:00
Dean Herbert
045dd94a6e Move online metrics out of BeatmapSetInfo model 2021-10-25 15:12:39 +09:00
Dean Herbert
94175bfb4a Update PreviewTrackManager to use IBeatmapSetInfo 2021-10-25 14:25:01 +09:00
Dean Herbert
19312435d0 Add ability to make test APIBeatmaps from test scenes
Allow tests to create a sample `APIBeatmapSet`

One step towards removing calls to `ToBeatmap` / `ToBeatmapSet`.
2021-10-25 14:18:13 +09:00
Dean Herbert
78edc7554e Fix BeatmapSetInfo's Status value being marked as non-databased 2021-10-25 12:05:34 +09:00
Bartłomiej Dach
feedd53a53
Add support for setting fixed size of status pill 2021-10-24 21:37:00 +02:00
Bartłomiej Dach
5ab3337a10
Update beatmap set status pill appearance 2021-10-24 20:40:34 +02:00
Dean Herbert
26cf5370c3 Remove unused reader parameter 2021-10-24 23:48:46 +09:00
Dean Herbert
5303cae044 Add mention of stream close logic 2021-10-24 23:43:37 +09:00
Susko3
51c5d0aec7 Update to be in line with framework changes 2021-10-24 13:21:41 +02:00
Bartłomiej Dach
d24fbc6ade
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-24 12:58:56 +02:00
Bartłomiej Dach
051cc2cd92
Update reference to configuration population process in comment 2021-10-24 12:47:17 +02:00
goodtrailer
0affe7b79d Remove unnecessary using 2021-10-23 02:25:20 -07:00
goodtrailer
4440b9ca11 Change IHasRepeats.NodeSamples to IList from List 2021-10-23 01:59:07 -07:00
Susko3
4a425b5c3e Merge remote-tracking branch 'upstream/master' into use-ShowFileInNativeExplorer 2021-10-23 10:01:24 +02:00
Joseph Madamba
1ae6621c85 Fix a missed toast shortcut string not localising correctly 2021-10-22 15:45:48 -07:00
Dan Balasescu
c6ca0e5895
Merge branch 'master' into fix-password-popover-focus 2021-10-22 22:52:46 +09:00
Dan Balasescu
9bb0d32fda
Merge pull request #15247 from peppy/beatmap-metadata-container-interface
Refactor `BeatmapMetadataContainer` and usages to use interface types
2021-10-22 22:42:23 +09:00
Dan Balasescu
e8fbb19c63
Merge branch 'master' into remove-unused-classes 2021-10-22 22:25:22 +09:00
Dean Herbert
c701579c69 Refactor BeatmapMetadataContainer and usages to use interface types 2021-10-22 21:38:50 +09:00
Dean Herbert
28d8820976
Merge pull request #15224 from peppy/no-more-beatmap-metadata-base
Remove `BeatmapMetadata` base class from API classes
2021-10-22 21:07:29 +09:00
Dean Herbert
90477e3788 Remove unused BeatmapTypeInfo class
Helps reduce the scope of upcoming changes.
2021-10-22 19:13:50 +09:00
Dan Balasescu
14a7b00f58
Merge pull request #15242 from peppy/fix-low-pass-sticking-after-fail
Fix low-pass filter continuing to take effect after fail animation has already ended
2021-10-22 19:04:03 +09:00
Dean Herbert
cc1d759290 Remove unnecessary setters from IBeatmapSetOnlineInfo interface 2021-10-22 17:48:09 +09:00
Dean Herbert
91cc77407d Fix low-pass filter continuing to take effect after fail animation has already ended 2021-10-22 17:02:02 +09:00
Dean Herbert
ea473428e8 Fix incorrect length mapping in APIBeatmap 2021-10-22 15:54:40 +09:00
Dean Herbert
de33b2f45a Return set metadata if available before falling back to empty object 2021-10-22 15:00:31 +09:00
Dean Herbert
eef9949a0a Remove unnecessary branching around EF logic 2021-10-22 14:48:20 +09:00
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09:00
Dean Herbert
82d0a6515f Fix incorrect conditional for checking whether import (would fail for default skin) 2021-10-22 14:08:12 +09:00
Dean Herbert
9cdc1ba592 Fix default legacy skin not being able to read from stored skin.ini 2021-10-22 13:43:45 +09:00
Dean Herbert
e5b73f25cd Ensure newly created skin.ini files are set to latest version 2021-10-22 12:56:05 +09:00
Dean Herbert
fb7cf35481 Remove BeatmapMetadata base class from APIBeatmap 2021-10-21 21:48:14 +09:00
Dean Herbert
6dd54a417f Remove BeatmapMetadata base class from APIBeatmapSet 2021-10-21 21:32:07 +09:00
Dean Herbert
9e0d839ef3
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-21 20:33:47 +09:00
Dean Herbert
c580ec865f APIBeatmapSet.Covers is never null 2021-10-21 19:34:01 +09:00
Dean Herbert
0fe0b5dc09 APIBeatmap implements IBeatmapInfo 2021-10-21 19:14:31 +09:00
Dean Herbert
40a176e86e APIBeatmapSet implements IBeatmapSetInfo 2021-10-21 19:14:19 +09:00
Dean Herbert
69e7810dad Enable nullable and switch classes to structs 2021-10-21 18:54:36 +09:00
Dan Balasescu
8ae05ee8f7
Merge branch 'master' into online-info-as-interface 2021-10-21 17:14:57 +09:00
Dean Herbert
0335ed6f27 Add missing licence header 2021-10-21 17:14:29 +09:00
Dean Herbert
ff674ca913 Remove unnecessary access modifiers from interface 2021-10-21 17:01:57 +09:00
Dean Herbert
b73bd54ab2 Split out individual pieces into own files 2021-10-21 16:58:42 +09:00
Dean Herbert
32d01f022f Rename usages which rely on online backing 2021-10-21 16:58:42 +09:00
Dean Herbert
0706ad70fb Move BeatmapSetOnlineInfo to an interface type 2021-10-21 16:58:42 +09:00
Dean Herbert
a5c155bc87 Remove APIPlaylistBeatmap subclass 2021-10-21 16:43:46 +09:00
Dean Herbert
a5088cac27 Fix default metadata propagation when no files are present 2021-10-21 13:43:42 +09:00
Dean Herbert
59b7210efa Revert disallowing imports with no files
While it is logical that we want this, from a testing perspective this is a bit of a nightmare to fix. Let's revisit at a later point in time.
2021-10-21 13:43:42 +09:00
Dean Herbert
7bc8f5cd5c Change selection colour to also match the colour provider scheme 2021-10-21 13:01:13 +09:00
Bartłomiej Dach
9ad9465020
Remove online-screen-local textbox recolours 2021-10-20 22:49:25 +02:00
Bartłomiej Dach
1ec881ce1d
Recolour focused text box variant 2021-10-20 22:49:25 +02:00
Bartłomiej Dach
addcef4f5d
Recolour text box using OverlayColourProvider 2021-10-20 22:49:25 +02:00
Dean Herbert
68c01fc204 Fix infinite loop on default skin (it can't have a skin.ini) 2021-10-20 17:56:45 +09:00
Dean Herbert
9e6e41d7c0 Add migration to reset and repopulate existing skin hashes 2021-10-20 17:56:45 +09:00
Dean Herbert
602303e947 Add test coverage for skin.ini contents 2021-10-20 17:56:45 +09:00
Dean Herbert
a95c754fd3 Fix multiple issues and make metadata fallback process more logical 2021-10-20 17:56:45 +09:00
Dean Herbert
439e90fce3 Disallow archive imports with no hashable files 2021-10-20 17:45:06 +09:00
Dean Herbert
fa542f2547 Include json files in skin hashing
This covers the new layout storage we are doing.
2021-10-20 17:45:06 +09:00
Dean Herbert
789c715f13 Add skin.ini write support to allow for more correct hashing 2021-10-20 17:45:06 +09:00
Dan Balasescu
08f3bc3f44
Merge pull request #15120 from peppy/realm-importer
Implement realm beatmap importer
2021-10-20 16:44:16 +09:00
Dean Herbert
da750a74fc Add xmldoc mention of valid OnlineID values 2021-10-20 15:24:27 +09:00
smoogipoo
c8cdc38efd Always compare OnlineIds by >0 2021-10-20 15:20:34 +09:00
smoogipoo
2c979d6420 Merge branch 'master' into localise-toasts 2021-10-20 15:04:07 +09:00
smoogipoo
a06f624a4a Fix possible exception with "invalid" key
Triggered by toggling Shift+Tab during gameplay.
2021-10-20 15:03:16 +09:00
Dean Herbert
4b2eb7736c Move helper method to bottom of file 2021-10-20 12:52:38 +09:00
Dean Herbert
37841ca3aa Remove incorrect ToString calls causing localisation to not actually apply 2021-10-20 10:41:34 +09:00
Bartłomiej Dach
f29eb08d93
Improve contrast in default OverlayColourProvider-themed appearance 2021-10-19 22:55:49 +02:00
Bartłomiej Dach
80da153697
Recolour a few other existing dropdowns with same hover & selection colours 2021-10-19 22:47:18 +02:00
Bartłomiej Dach
61127a389c
Fix tab dropdown receiving accent colour too early 2021-10-19 22:09:51 +02:00
Bartłomiej Dach
ef03787fe0
Split dropdown accent colour into hover and selection colours 2021-10-19 22:09:51 +02:00
Dean Herbert
8672b3325a Fix a couple more weird variable names 2021-10-19 17:22:50 +09:00
Dean Herbert
61670a70b6 Tidy up tracked settings code syntax and fix remaining issue 2021-10-19 17:21:07 +09:00
Dean Herbert
192cfe8717
Replace unnecessary ToString call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-19 16:42:07 +09:00
Dean Herbert
c97cfdd978 Merge branch 'master' into localise-toasts 2021-10-19 16:37:14 +09:00
Dean Herbert
7cf4395875 Merge branch 'master' into default-value-indicator 2021-10-19 16:23:02 +09:00
Dean Herbert
480dc57102 Schedule joinFailed callback for added safety 2021-10-19 15:54:12 +09:00
Dean Herbert
da524261c0 Fix focus potentially being transferred too far up when password is being verified 2021-10-19 15:53:29 +09:00
Dean Herbert
a589964dc7 Centralise join logic 2021-10-19 15:53:29 +09:00
Dean Herbert
8944b1dd78 Add basic test coverage of DrawableLoungeRoom 2021-10-19 15:36:27 +09:00
Dean Herbert
473459d191 Add layout duration to PasswordEntryPopover to make error text look a bit smoother 2021-10-19 15:36:27 +09:00
Dean Herbert
d35fe5493a Change default value of DrawableLoungeRoom.matchingFilter so they display by default 2021-10-19 15:36:27 +09:00
Dean Herbert
d3ab45084d Fix realm migration potentially failing from older releases 2021-10-19 14:19:58 +09:00
sh0ckR6
e7b280fc81
Comment out RankDisplay
Commented out as it may be revisited at a later time.
Also currently unused.
2021-10-18 23:12:33 -04:00
Dean Herbert
ff2eae4597 Rename confusing variable 2021-10-19 11:37:46 +09:00
Dan Balasescu
30af27e561
Merge branch 'master' into realm-importer 2021-10-19 11:06:11 +09:00
Dan Balasescu
4fcdeffbd9
Merge pull request #15176 from peppy/realm-indexed-online-id
Change `OnlineID` to non-nullable to allow for indexing in Realm
2021-10-19 11:05:34 +09:00
Bartłomiej Dach
8db2fc439d
Change ruleset ID assert in player to null-check 2021-10-18 23:45:06 +02:00
Bartłomiej Dach
6d9d85685f
Fix settings item having zero height 2021-10-18 23:30:38 +02:00
Bartłomiej Dach
cc9727ec11
Merge branch 'master' into default-value-indicator 2021-10-18 22:07:58 +02:00
Bartłomiej Dach
88a1b31fae
Remove grid usage in SettingsItem 2021-10-18 22:07:32 +02:00
Bartłomiej Dach
6c3637a62a
Remove grid usage in KeyBindingRow 2021-10-18 22:07:30 +02:00
Bartłomiej Dach
830f49bca6
Remove doubled-up opacity specification 2021-10-18 19:43:48 +02:00
Dean Herbert
b3219bb592 Update usages of OnlineID 2021-10-18 16:16:36 +09:00
Dean Herbert
6904938dc1 Merge branch 'realm-indexed-online-id' into realm-importer 2021-10-18 16:14:37 +09:00
Dean Herbert
88a575462c Work around weird null inspection 2021-10-18 16:11:55 +09:00
Dean Herbert
2c5ba1d8e2 Change OnlineID to non-nullable to allow for indexing in Realm 2021-10-18 15:53:40 +09:00
Dan Balasescu
8643c725cc
Merge pull request #15175 from peppy/fail-animation-flash-controlled-by-setting
Don't flash screen red on fail if the user has disabled red tinting
2021-10-18 15:27:10 +09:00
Dan Balasescu
f2f9872718
Merge pull request #15173 from peppy/fix-epilepsy-warning-fade-out
Fix epilepsy warning not being faded out on an early exit during gameplay load
2021-10-18 15:18:38 +09:00
Dean Herbert
b2f9f8b8da Update logic surrounding removal of previous OnlineIDs when running a new import 2021-10-18 15:14:13 +09:00
Dean Herbert
264fa703f2 Remove some forgotten temporary code from BeatmapImporter
And make the online queue not `dynamic`, at very least.
2021-10-18 14:43:50 +09:00
Dean Herbert
75bfa705cf Remove unused method for now 2021-10-18 14:32:38 +09:00
Dean Herbert
ad112cbbc5 Fix intendation in a way it doesn't regress with older inspectcode 2021-10-18 14:28:29 +09:00
Dean Herbert
3c4c9ab7a7 Move ICanAcceptFiles specification to IModelImporter<TModel> 2021-10-18 14:25:51 +09:00
Dean Herbert
762949f49f Don't flash screen red on fail if the user has disabled red tinting 2021-10-18 14:20:38 +09:00
Dean Herbert
6d6eed61aa Fix new indentation inspections 2021-10-18 14:00:35 +09:00
Dean Herbert
59dc04017e Fix epilepsy warning not being faded out on an early exit from PlayerLoader 2021-10-18 13:30:37 +09:00
Bartłomiej Dach
2a41e8bd1f
Remove unneeded extra padding from settings number box 2021-10-17 21:50:04 +02:00
Bartłomiej Dach
552fc1dc8a
Adjust key binding rows to accommodate new default value indicator 2021-10-17 21:50:04 +02:00
Bartłomiej Dach
f422ebb281
Adjust SettingsItem to accommodate new default value indicator 2021-10-17 21:50:03 +02:00
Bartłomiej Dach
818f35c35f
Restyle default value indicator 2021-10-17 21:50:03 +02:00
5ln
3529f34c98
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
Signed-off-by: 5ln <xnafumie@gmail.com>
2021-10-18 02:01:50 +08:00
Susko3
25f172fae8 Update usages of OpenInNativeExplorer to use ShowFileInNativeExplorer
Also updates WrappedStorage to override ShowFileInNativeExplorer.
2021-10-17 12:56:29 +02:00
Bartłomiej Dach
874decb3cd
Replace spectator-local fix for wrong ruleset ID with player-global consistency check 2021-10-16 16:10:42 +02:00
Bartłomiej Dach
e57d6e930e
Source spectator state sent to server from gameplay state 2021-10-16 13:48:49 +02:00
Dean Herbert
7a5a612896 Move retry and exit hotkey overlays to same depth / container 2021-10-16 02:29:45 +09:00
Dean Herbert
e9f50179ab
Merge branch 'master' into fail-animation-update 2021-10-15 23:32:10 +09:00
Dean Herbert
91754450b2 Remove dispose method completely 2021-10-15 21:27:44 +09:00
Dean Herbert
6f947cacbd Fix test failures 2021-10-15 21:22:38 +09:00
Dean Herbert
c47497923a Schedule drag events for now 2021-10-15 19:52:44 +09:00
Dean Herbert
30c3fcb4ea Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 19:45:04 +09:00
Dean Herbert
3909fd8caa Fix wonkiness when dragging slider end at high input refresh rates 2021-10-15 19:43:57 +09:00
Dean Herbert
b9fd1f52df Tweak animation slightly 2021-10-15 19:37:22 +09:00
Dean Herbert
b08743342b Fix incorrect nesting 2021-10-15 19:35:08 +09:00
Dean Herbert
66f3370a19 Add new fail animation to better match new sound effects 2021-10-15 19:14:59 +09:00
Dean Herbert
a59ee9ec1f
Merge pull request #15121 from nekodex/fail-highpass
Add high-pass filter to gameplay fail sequence
2021-10-15 19:14:44 +09:00
Dean Herbert
ae33b7b87f Update resources 2021-10-15 18:27:01 +09:00
Dan Balasescu
8d11f4ce48
Merge pull request #15075 from peppy/fix-editor-difficulty-name-update
Use actual `BeatmapInfo` rather than `PlayableBeatmap.BeatmapInfo` for editor writes
2021-10-15 18:12:12 +09:00
Dan Balasescu
3d314dad9f
Merge pull request #15115 from peppy/fix-realm-config-save-overhead
Fix changing osu!mania scroll speed causing game-wide lag
2021-10-15 17:33:42 +09:00
Dean Herbert
0e1f144bf4 Rename ArchiveModelImporter with Realm prefix to avoid confusion 2021-10-15 17:08:43 +09:00
Dean Herbert
cd64faa4f9 Tidy up importer difficulty creation code 2021-10-15 17:07:34 +09:00
Dean Herbert
49969ac328 Add beatmap import and file store tests 2021-10-15 17:07:34 +09:00
Jamie Taylor
8d6d7fcdbe
Add high-pass filter to gameplay fail sequence 2021-10-15 17:03:37 +09:00
Dean Herbert
d95a62fa56 Add models and stores for beatmap manager requirements 2021-10-15 16:58:41 +09:00
Dan Balasescu
3604a762d0
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 16:58:01 +09:00
Dan Balasescu
05150b34e5
Merge pull request #15117 from peppy/update-present-import-post-import
Update one missed instance of `PresentImport`
2021-10-15 16:57:47 +09:00
Dan Balasescu
56758435ee
Merge pull request #15043 from peppy/realm-ruleset-store
Add realm `RulesetStore`
2021-10-15 16:49:48 +09:00
Dean Herbert
8fb9aec730 Fix threaded realm usage not disposing context fast enough 2021-10-15 16:39:53 +09:00
Dan Balasescu
34d60b9e10
Merge branch 'master' into fix-realm-config-save-overhead 2021-10-15 16:30:39 +09:00
Dean Herbert
e9c3d09e0e Remove redundant specs 2021-10-15 16:27:16 +09:00
Dean Herbert
fdb734ac91 Also add spec directly to IModelImporter 2021-10-15 16:24:40 +09:00
Dean Herbert
2eb1170c0c Use AsNonNull instead 2021-10-15 16:15:34 +09:00
Dean Herbert
efaed4cba4 Revert "Attempt bumping inspectcode to fix remaining inspection"
This reverts commit e018a6d6a5.
2021-10-15 16:14:57 +09:00
Dean Herbert
a90f40e831 Update one missed instance of PresentImport 2021-10-15 16:00:09 +09:00
Dan Balasescu
745f319c7d
Merge branch 'master' into fix-realm-disposal-order 2021-10-15 15:44:14 +09:00
Dean Herbert
e018a6d6a5 Attempt bumping inspectcode to fix remaining inspection 2021-10-15 14:08:25 +09:00
Dan Balasescu
48a9ab9e89
Merge branch 'master' into fix-multiplayer-tests 2021-10-15 14:04:27 +09:00
Dean Herbert
e38eb31fd4 Merge branch 'fix-realm-disposal-order' into fix-realm-config-save-overhead 2021-10-15 14:00:31 +09:00
Dean Herbert
818fac6ac8 Make realm a non-drawable component to better order disposal
Until now, the `RealmContextFactory` would be disposed as part of the
drawable hierarchy. This is too early, as it may be being used by higher
level components (like `ConfigManager`s, see #15115) that perform final
operations after the drawables have been disposed.

Seems to make sense moving this out of the drawable hierarchy and in
line with how we were doing things with EF.
2021-10-15 13:58:16 +09:00
Dan Balasescu
1e15b5a5a0
Merge pull request #15113 from peppy/rounded-button-colour-provider
Change `RoundedButton` to source from overlay colour provider
2021-10-15 13:52:52 +09:00
Dean Herbert
e47ccbd08a Fix realm transactional overhead when rapidly changing RulesetConfigManager values 2021-10-15 13:50:26 +09:00
smoogipoo
80dfd11c90 Remove unnecessary extra task
Further testing shows continuations also run before the .Wait() returns.
2021-10-15 13:28:02 +09:00
Dean Herbert
7ab028576e Change RoundedButton to source from overlay colour provider 2021-10-15 12:54:19 +09:00
Dean Herbert
f73e505ee6 Further adjustments to glow to be less bright on settings overlay 2021-10-15 12:35:19 +09:00
Dean Herbert
e1ac5fbed9 Remove externally exposed Expanded state and change behaviour and visuals surrounding it 2021-10-15 12:13:42 +09:00
Dean Herbert
35d776078c Ensure sliderbar nub stays glowing while dragging an adjustment 2021-10-15 11:51:08 +09:00
Dean Herbert
be3b88a5c3 Adjust glow to look good 2021-10-15 11:48:19 +09:00
Dean Herbert
3a25bdaf3d
Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 11:18:37 +09:00
Dean Herbert
874d722820
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 11:14:45 +09:00
Bartłomiej Dach
ed2f9dd443
Adjust settings slider spacings 2021-10-15 00:31:06 +02:00
Bartłomiej Dach
a10a7e7903
Refresh nub/slider appearance and use overlay theming 2021-10-15 00:31:05 +02:00
smoogipoo
eed8fa8d69 Expand comment a bit 2021-10-15 00:20:45 +09:00
smoogipoo
e6ee360511 Fix intermittent multiplayer tests 2021-10-15 00:10:39 +09:00
Dean Herbert
ad0732484f Just wait for metadata section to be loaded 2021-10-14 22:12:38 +09:00
Dean Herbert
9d54285b2e Merge branch 'master' into fix-multiplayer-sounds-during-gameplay 2021-10-14 21:34:04 +09:00
Dean Herbert
a31f5ca326 Update framework 2021-10-14 20:13:55 +09:00
Dean Herbert
06249c4ab2 Fix incorrect usages of Scheduler.AddOnce 2021-10-14 17:52:19 +09:00
Dean Herbert
0d86dab80a Fix multiplayer components updating when not alive
Should close https://github.com/ppy/osu/issues/15092.

- [ ] Depends on https://github.com/ppy/osu-framework/pull/4826.
2021-10-14 17:37:10 +09:00
smoogipoo
901f107b2e Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-14 17:25:51 +09:00
Dan Balasescu
fb9c3fe72e
Merge pull request #14619 from peppy/no-more-difficulty-control-points-info
Move `DifficultyControlPoint`s to be specified at a per-`HitObject` level
2021-10-14 17:24:32 +09:00
Dean Herbert
1212b08672 Fix gameplay audio ramping down in frequency a second time at the end of the fail sequence 2021-10-14 16:45:34 +09:00
Dean Herbert
8a4c0c0ac8 Lock one more case of usage 2021-10-14 16:22:43 +09:00
Dean Herbert
060bb1afbd Add locking around async beatmap (task) retrieval 2021-10-14 15:39:53 +09:00
Dean Herbert
4ed794e434 Throw and log instead of silently failing on type/instance creation failure 2021-10-14 14:24:36 +09:00
Dean Herbert
364fa068b3 Add non-null check to appease inspection 2021-10-14 14:20:34 +09:00
Dean Herbert
ccc8012fd4 Mark non-localisable strings 2021-10-14 14:16:39 +09:00
Dean Herbert
e0babe4b79 Add global logging of WorkingBeatmap changes 2021-10-14 14:07:43 +09:00
Dean Herbert
09536cd733 Add logging of WorkingBeatmapCache.Invalidate calls 2021-10-14 14:05:33 +09:00
Dean Herbert
b1fc870130 Adjust item selection and chevron animation slightly 2021-10-14 13:34:08 +09:00
Dean Herbert
bf1000000e
Merge branch 'master' into dropdown-refresh 2021-10-14 12:48:56 +09:00
smoogipoo
aa380a11c1 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-14 12:02:10 +09:00
Dean Herbert
8d479bbe56
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-14 10:17:01 +09:00
Bartłomiej Dach
c7db286b94
Merge branch 'master' into file-sanity-checks 2021-10-14 00:17:29 +02:00
Bartłomiej Dach
d2115824fa
Merge branch 'master' into dropdown-refresh 2021-10-13 23:53:14 +02:00
Bartłomiej Dach
d8450a7375
Recolour "slim dropdown" in online lounge screens 2021-10-13 22:57:37 +02:00
Bartłomiej Dach
f3647eb94e
Recolour room settings screens to match dropdown theming 2021-10-13 22:50:19 +02:00
Bartłomiej Dach
d067159435
Recolour elements of editor setup screen to match dropdown theming 2021-10-13 22:32:54 +02:00
Bartłomiej Dach
a6c2848460
Fix hovered dropdown item chevron not using OverlayColourProvider 2021-10-13 22:08:23 +02:00
Bartłomiej Dach
7e7b747755
Always use OverlayColourProvider in scroll containers if available 2021-10-13 22:05:48 +02:00
Bartłomiej Dach
d4e3460912
Always use OverlayColourProvider in dropdowns if available 2021-10-13 22:04:48 +02:00
Bartłomiej Dach
d205483a36
Revert ThemedDropdown-related changes 2021-10-13 21:57:50 +02:00
Dean Herbert
f7a5879fa6
Merge pull request #15056 from smoogipoo/fix-gamehost-tests
Fix GameHosts being run on TPL threads
2021-10-13 23:06:26 +09:00
smoogipoo
fdf7142711 Remove Room.Position 2021-10-13 21:24:54 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-13 20:17:57 +09:00
Dean Herbert
2af1e6acc7 Update framework 2021-10-13 18:02:22 +09:00
Dan Balasescu
d88daf0cc2
Merge pull request #15073 from peppy/fix-player-loader-low-pass
Improve `PlayerLoader` audio and visual transitions
2021-10-13 17:01:49 +09:00
Dean Herbert
93d7cdc509 Don't check whether the source realm was closed or not
Based on what we now know, this is not required, as long as there is
another realm context open on the same thread.
2021-10-13 15:50:06 +09:00
Dean Herbert
2fb5c85377
Merge branch 'master' into realm-ruleset-store 2021-10-13 15:25:18 +09:00
Dean Herbert
f5f0486e18
Merge branch 'master' into realm-live 2021-10-13 15:24:34 +09:00
Dean Herbert
29dfe33465 Rewrite AudioFilter to be easier to follow (and fix tests) 2021-10-13 15:17:20 +09:00
Dean Herbert
02689a1b60 Use actual BeatmapInfo rather than PlayableBeatmap.BeatmapInfo for editor writes 2021-10-13 14:50:12 +09:00
Dan Balasescu
3445d915b9
Merge pull request #15074 from peppy/fix-storyboard-fail-test-fails
Fix storyboard outro during fail test not being lenient enough
2021-10-13 14:16:26 +09:00
Dan Balasescu
df5a76ad9d
Merge pull request #15041 from peppy/realm-file-store
Add realm `FileStore`
2021-10-13 13:54:56 +09:00
Dean Herbert
26a1e40d24 Fix storyboard outro during fail test not being lenient enough 2021-10-13 13:48:57 +09:00
Dean Herbert
ae4dcbd829 Improve PlayerLoader audio and visual transitions 2021-10-13 13:26:20 +09:00
Dean Herbert
b37096f440 Avoid using bindable for AudioFilter cutoff
It doesn't play nicely with screen exiting, as it is automatically
unbound during the exit process. Easiest to just avoid using this for
now.
2021-10-13 13:25:55 +09:00
smoogipoo
cf10239e70 Add a few nullabilities and DCC excludes 2021-10-13 12:51:46 +09:00