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

23279 Commits

Author SHA1 Message Date
Dean Herbert
9ed45ce1ca Remove redundant double call to ValueChanged on UserMods change 2021-02-16 14:31:00 +09:00
Dean Herbert
0ca747b39f Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-16 14:25:27 +09:00
Dean Herbert
31a5cdd8ac Fix current selection not updating visually after creating a new playlist 2021-02-16 14:02:21 +09:00
Dean Herbert
e969ca8974 Remove unused using statement that rider could not identify 2021-02-16 13:52:42 +09:00
Dean Herbert
e82922f8c5 Add the ability to deselect the currently selected room via clicking away
Always felt wrong that you couldn't do this until now.
2021-02-16 13:44:37 +09:00
Salman Ahmed
0e7f52b5cc Always use JSON property global_rank for global ranks instead 2021-02-16 07:33:16 +03:00
Salman Ahmed
5b4999e8af Update user statistics retrieval with API changes 2021-02-16 07:33:13 +03:00
Dean Herbert
02417697e9 Display remaining attempts for playlist rooms with room-level attempt limits 2021-02-16 13:32:14 +09:00
Joehu
e838a5d9f0 Fix comment edited at date not showing tooltip 2021-02-15 19:04:23 -08:00
Salman Ahmed
d15ffff9a5 Simplifiy user statistics retrieval to one-time on deserialization 2021-02-16 04:48:36 +03:00
Salman Ahmed
62514f23b5 Remove unnecessary json settings override 2021-02-16 04:48:36 +03:00
Salman Ahmed
1466f36649 Improve documentation on Statistics 2021-02-16 04:48:36 +03:00
Salman Ahmed
a1496cd8f3 Remove necessity of using CurrentModeRank as a fallback 2021-02-16 04:48:36 +03:00
Salman Ahmed
90aa6256d7 Merge branch 'master' into multiplayer-participant-rank 2021-02-16 04:44:57 +03:00
Dean Herbert
a1bee5d721
Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 22:05:11 +09:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
Dean Herbert
2e646882fa Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 21:22:21 +09:00
Dean Herbert
1ac274e478 Update framework 2021-02-15 21:22:18 +09:00
Dan Balasescu
6641f4d5a9
Merge branch 'master' into hub-send-version-hash 2021-02-15 21:12:46 +09:00
Dan Balasescu
5f7bfc4304
Merge branch 'master' into fix-test-signalr-connection-failures 2021-02-15 19:35:50 +09:00
Dan Balasescu
6bfc7da671
Fix sample potentially playing at the wrong frequency
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-15 18:10:45 +09:00
Dean Herbert
de52b8a5ba Fix test failures in PerformFromScreen tests 2021-02-15 17:14:41 +09:00
Dean Herbert
3562fddc27 Add missing nullability flag on CreateAccount return value 2021-02-15 17:02:07 +09:00
Dean Herbert
55d5d8d5be Send version hash on hub connection 2021-02-15 16:51:40 +09:00
Dean Herbert
9ad38ab20e Move HubClientConnector retrieval to IAPIProvider 2021-02-15 16:43:56 +09:00
Dean Herbert
9cba350337 Refactor again to better cover cases where the pause dialog should definitely be shown 2021-02-15 15:57:36 +09:00
Dean Herbert
1aea840504 Add missing return in early exit scenario (MakeCurrent isn't compatible with the following Exit) 2021-02-15 15:03:12 +09:00
smoogipoo
c6ed3efa4a Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 14:47:32 +09:00
Dean Herbert
2b69c7b325 Fix incorrect order of operation in pause blocking logic 2021-02-15 14:24:08 +09:00
Dan Balasescu
34e600464b
Merge branch 'master' into abstract-hub-connection 2021-02-15 13:53:54 +09:00
Dean Herbert
1a200148e5
Merge pull request #11770 from Joehuu/fix-extra-mod-settings-overflowing
Fix extra mod settings overflowing from screen in multi room
2021-02-13 14:39:08 +09:00
Joehu
982d8e35ed Fix mod settings showing scrollbar when screen is offset 2021-02-12 10:42:48 -08:00
Joehu
b28a906197 Fix extra mod settings overflowing from screen 2021-02-12 10:29:29 -08:00
Joehu
52975c5185 Remove hardcoded padding from main content 2021-02-12 10:23:33 -08:00
Dan Balasescu
5a357d71ac
Merge pull request #11761 from peppy/fix-welcome-intro-looping
Fix classic "welcome" intro not looping as expected
2021-02-12 21:52:11 +09:00
Dean Herbert
a080a9bdbc
Merge pull request #11603 from Game4all/handle-stable-imports-custom-songs-folder
Handle beatmap import from a stable installation with a custom Songs directory
2021-02-12 21:42:36 +09:00
smoogipoo
9b5995f2f1 Update with removal of looping parameter 2021-02-12 19:05:17 +09:00
smoogipoo
0c3aef8645 Fix potential race in looping sample
As mentioned via GitHub comments. Very unlikely for this to happen unless: the sample takes a short amount of time to load, is very short itself, and the update thread stalls until the sample fully completes.
2021-02-12 17:42:35 +09:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dean Herbert
4ab16694d1 Fix classic "welcome" intro not looping as expected 2021-02-12 16:22:19 +09:00
Dan Balasescu
267869bd0b
Merge pull request #11759 from peppy/chat-show-url-in-tooltips
Show URLs in tooltips when custom text has replaced the link
2021-02-12 16:04:55 +09:00
Dean Herbert
18c1c8faf2
Merge pull request #11758 from smoogipoo/fix-multiplayer-header-sprite
Fix header background being invisible in multiplayer/playlists
2021-02-12 16:03:50 +09:00
Dan Balasescu
dad6e7e825
Merge pull request #11755 from peppy/fix-message-formatter-domain
Fix MessageFormatter not working for custom endpoints
2021-02-12 16:01:55 +09:00
Dean Herbert
a073376920 Show URLs in tooltips when custom text has replaced the link 2021-02-12 15:32:31 +09:00
smoogipoo
a1be3c8bfd Fix header background being invisible in multiplayer/playlists 2021-02-12 15:27:37 +09:00
Dean Herbert
3799493536 Add test coverage of int match failures 2021-02-12 15:25:00 +09:00
Dean Herbert
bb9123eecd Better handle fallback scenarios for beatmap links 2021-02-12 15:17:54 +09:00
Dean Herbert
1c5aaf3832 Add back default value 2021-02-12 15:03:53 +09:00
Dean Herbert
6a42d312f6 Match using EndsWith to ignore protocol (and allow http) 2021-02-12 14:59:56 +09:00
Dean Herbert
33c9ecac8a Fix MessageFormatter not working for custom endpoints 2021-02-12 14:54:19 +09:00
Dan Balasescu
cb4d119f23
Merge pull request #11740 from peppy/editor-fix-slider-samples-new-placement
Fix newly placed sliders in the editor not playing hitsounds
2021-02-12 13:31:00 +09:00
Dean Herbert
8ab7d07eab Tidy up config parsing logic 2021-02-12 12:57:57 +09:00
Dean Herbert
5f23bd7259 Revert most of the changes to ArchiveModeManager by using better code 2021-02-12 12:48:32 +09:00
Dean Herbert
a2035a2e84 Stop hover sounds from playing when dragging (scrolling) 2021-02-12 12:22:35 +09:00
Dean Herbert
cd01591dda Consume new debounce logic in carousel header 2021-02-12 12:22:35 +09:00
Dean Herbert
970039b7e3 Split out hover sample debounce logic so it can be more easily used in other places 2021-02-12 12:14:49 +09:00
Dan Balasescu
0040f14132
Merge pull request #11735 from peppy/decrease-global-track-volume
Decrease the game-wide track playback volume to give samples some head-room
2021-02-12 00:19:32 +09:00
Dan Balasescu
ca091431f4
Merge pull request #11739 from peppy/settings-item-tooltips
Display descriptions in tooltips of mod settings adjustments
2021-02-12 00:18:16 +09:00
Dean Herbert
4d6256ab18
Merge pull request #11741 from peppy/update-resources
Update resources
2021-02-11 20:14:16 +09:00
Salman Ahmed
f4a7ec57e9 Remove unused using 2021-02-11 13:00:18 +03:00
Salman Ahmed
37e3d95c35 Slight reword in ConfigureConnection's xmldoc 2021-02-11 12:39:06 +03:00
Salman Ahmed
d3c1b47592 Replace nullable API with null connector instead 2021-02-11 12:34:39 +03:00
Dean Herbert
ffd3caacb5 Update resources 2021-02-11 17:57:50 +09:00
Dean Herbert
f84ea30637 Expose Mods in DrawableRuleset to avoid using external DI 2021-02-11 17:47:29 +09:00
Dean Herbert
aaa0362b12 Merge branch 'master' into autoplay-rate-independence 2021-02-11 17:39:45 +09:00
Dean Herbert
e9730d4782 Move default sample addition to inside PlacementBlueprint
This isn't actually required to fix the behaviour but it does feel like
a better place to put this logic.
2021-02-11 17:16:18 +09:00
Salman Ahmed
18acd7f080
Apply documentation suggestions
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-11 10:51:04 +03:00
Salman Ahmed
5fb99fdc52 Rename some members and extract connection closure to separate method 2021-02-11 10:49:16 +03:00
Dean Herbert
9fb41dc0b6 Move property to a better place in the class 2021-02-11 16:41:21 +09:00
Dean Herbert
dddd776802 Add the ability for settings items to have tooltips 2021-02-11 16:38:17 +09:00
Dean Herbert
6e2994f98e
Merge pull request #11133 from smoogipoo/difficulty-adjustment-extension
Allow ModDifficultyAdjustment to extend beyond the sane limits of the game
2021-02-11 16:19:00 +09:00
Dean Herbert
3990738dbb
Merge pull request #11734 from nekodex/fix-checkbox-sound
Prevent the default on-click sample from playing for OsuCheckbox
2021-02-11 16:02:37 +09:00
Dean Herbert
98c5b0220c
Merge pull request #11725 from smoogipoo/freemods-user-settings
Add local user customisation for freemod mod settings
2021-02-11 16:02:24 +09:00
Dean Herbert
889a99c49c Use AddOnce everywhere to reduce potential call count 2021-02-11 16:00:52 +09:00
Dean Herbert
549e7520c5 Move scheduler logic to client callback rather than inside the update method 2021-02-11 16:00:52 +09:00
Dean Herbert
21f66a19fd Make server authoritative in which mods the client should be using when gameplay starts 2021-02-11 15:55:18 +09:00
Dean Herbert
3344e9f27f
Merge pull request #11720 from nekodex/new-buttonsystem-edit-sound
Use unique sample for edit button click (ButtonSystem)
2021-02-11 15:10:35 +09:00
Dean Herbert
df7aaa5c81 Move implementation to OsuGameBase to ensure it applies to test scenes
This also removed a previous attempt at the same thing, which happened
to not be applying due to the reference to the applied bindable not
being held. Whoops.
2021-02-11 15:02:36 +09:00
Dean Herbert
eaa7b4cb93 Rename second usage variable name to match 2021-02-11 14:54:50 +09:00
Dean Herbert
f21a3c0c48 Decrease the game-wide track playback volume to give samples some head-room 2021-02-11 14:50:55 +09:00
Jamie Taylor
c8899aff92 Prevent the default on-click sample from playing for OsuCheckbox 2021-02-11 14:36:41 +09:00
Dean Herbert
cbdc189ab2 Merge branch 'new-overlay-sounds' into update-resources 2021-02-11 14:20:23 +09:00
Dean Herbert
26c9a60b0d Merge branch 'hover-pitch-randomisation' into update-resources 2021-02-11 14:20:22 +09:00
Dean Herbert
e53242c159 Merge branch 'new-toolbar-sounds' into update-resources 2021-02-11 14:20:21 +09:00
Dean Herbert
2afea88a25 Merge branch 'new-carousel-sounds' into update-resources 2021-02-11 14:20:20 +09:00
Dean Herbert
da31048803 Merge branch 'new-heartbeat-sounds' into update-resources 2021-02-11 14:20:19 +09:00
Dean Herbert
4ffb7fb753 Merge branch 'osd-toggle-sounds' into update-resources 2021-02-11 14:20:18 +09:00
Dean Herbert
18a43d137b Merge branch 'notification-sounds' into update-resources 2021-02-11 14:20:17 +09:00
Dean Herbert
800f12a358 Update resources 2021-02-11 14:19:48 +09:00
Dean Herbert
896f318b56 Rename variable for clarity 2021-02-11 14:18:40 +09:00
Dean Herbert
72562070bc Remove second overload of Close (makes the call structure hard to follow / invoke correctly) 2021-02-11 14:18:00 +09:00
Jamie Taylor
2ee634d173 Create subclass for "Error" notifications to allow them to have a unique pop-in sound 2021-02-11 13:55:43 +09:00
Jamie Taylor
a1ae739a62 Add support for Notification sounds 2021-02-11 13:51:54 +09:00
Jamie Taylor
c12c09ec4d Move logic to LoadComplete instead 2021-02-11 09:57:14 +09:00
Jamie Taylor
63e6ec1c9f Add audio feedback for OSD value changes 2021-02-11 09:23:04 +09:00
Salman Ahmed
0c5e66205b Merge branch 'master' into abstract-hub-connection 2021-02-11 02:14:22 +03:00
smoogipoo
07b661e28c Add Messagepack support for serialising unknown bindable types 2021-02-10 23:44:06 +09:00
smoogipoo
be9b07a4cf Merge branch 'master' into difficulty-adjustment-extension 2021-02-10 20:42:08 +09:00
smoogipoo
86682cdb34 Add client/room null check 2021-02-10 20:16:26 +09:00
smoogipoo
169acb42de Xmldoc + cleanup 2021-02-10 20:12:29 +09:00
smoogipoo
6fff7c39da Ensure tracker is disposed 2021-02-10 20:09:45 +09:00
smoogipoo
4a405bb859 Split ModSettingChangeTracker into separate file 2021-02-10 20:04:16 +09:00
smoogipoo
822c66033f Add local-user freemod configuration 2021-02-10 19:56:59 +09:00
smoogipoo
7827e991b2 Also clear event on dispose 2021-02-10 19:43:39 +09:00
smoogipoo
393cd6c74a Add helper class for tracking changes to mod settings 2021-02-10 19:40:07 +09:00
Jamie Taylor
996f1098f6 Use alternate sample on the downbeat while hovering OsuLogo 2021-02-10 18:17:48 +09:00
Dean Herbert
625eb78a11 Simplify with an early exit for null sample 2021-02-10 17:59:52 +09:00
Jamie Taylor
bc7f4a4f88 Use a single sample for CarouselHeader on-hover with randomised pitch instead of multiple samples 2021-02-10 17:53:47 +09:00
Jamie Taylor
4e2ab0bad2 Use a separate sample set for Toolbar buttons 2021-02-10 17:48:36 +09:00
Dean Herbert
9e400acd1a Merge branch 'master' into fix-mod-settings-fuckery 2021-02-10 17:43:03 +09:00
Jamie Taylor
73ab1b2b21 Add pitch randomisation to HoverSounds on-hover sample playback 2021-02-10 17:42:24 +09:00
Jamie Taylor
22995c216d Use unique sample for edit button click (ButtonSystem) 2021-02-10 17:23:55 +09:00
Jamie Taylor
3eda78c363 Use unique samples for Dialog, NowPlaying, SettingsPanel and WaveOverlay pop-in/pop-out 2021-02-10 16:04:47 +09:00
Jamie Taylor
806324b196 Allow overriding of Overlay pop-in and pop-out samples 2021-02-10 15:44:05 +09:00
Dean Herbert
b3b0d97354 Avoid potential feedback from bindable event binds 2021-02-10 15:33:04 +09:00
Dean Herbert
67c1c4c1eb Copy settings before applying selection 2021-02-10 15:30:17 +09:00
Dean Herbert
435c85a2e7 Avoid executing selection twice on ModSelectOverlay load 2021-02-10 15:13:09 +09:00
Dean Herbert
a39263423c Fix externally changed settings from being reset when ModSelectOverlay is initialised 2021-02-10 15:12:29 +09:00
Dean Herbert
75bc9f607e Rename wrongly named method 2021-02-10 14:55:15 +09:00
Dean Herbert
52f0f3f3b2 Add a note about SelectedMods behavioural quirks 2021-02-10 14:38:15 +09:00
Dean Herbert
e44667e5e0
Use MinValue instead
Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
2021-02-10 11:31:34 +09:00
Andrei Zavatski
d9dcf8a042 Fix incorrect header depth in OnlineOverlay 2021-02-09 20:30:31 +03:00
Dan Balasescu
92599aa02b
Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-09 21:06:09 +09:00
Dan Balasescu
15b3747945
Merge pull request #11716 from peppy/defer-playlist-load
Defer playlist load to improve load time of the now playing overlay
2021-02-09 20:59:51 +09:00
Dean Herbert
d8d830db6e Defer playlist load to improve load time of the now playing overlay 2021-02-09 19:46:57 +09:00
Dean Herbert
1670766633 Avoid unbinding external events 2021-02-09 18:42:15 +09:00
Dean Herbert
178d88bcf1 Change BackgroundColour into a property 2021-02-09 18:32:44 +09:00
Dean Herbert
b5fa950800 Remove unnecessary depth specification 2021-02-09 18:30:05 +09:00
Dean Herbert
3206c7cbae
Merge branch 'master' into overlay-header-refactor 2021-02-09 18:20:07 +09:00
Dean Herbert
2c052d70e8 Only trigger pause cooldown on pause (not exit) 2021-02-09 17:29:18 +09:00
Dean Herbert
cba116ff09 Fix incorrect call parameter for quick exit 2021-02-09 17:28:57 +09:00
Dean Herbert
61b9539864 Fix regression in quick exit logic 2021-02-09 17:14:16 +09:00
Dean Herbert
4e3bb27cd5
Merge branch 'master' into fix-mod-settings-fuckery 2021-02-09 16:47:39 +09:00
Dean Herbert
5bd4f74ddf Fix a potential crash when exiting play during the results screen transition 2021-02-09 16:24:29 +09:00
Dean Herbert
1cb51fa8d2
Merge branch 'master' into autoplay-rate-independence 2021-02-09 16:05:34 +09:00
Dean Herbert
04c243386b Fix initial state transfer regressing 2021-02-09 16:02:56 +09:00
Salman Ahmed
f04d6d5e5e Update hub clients with changes to connecotr 2021-02-09 08:02:32 +03:00
Salman Ahmed
848b81e952 Remove necessity of making hub client connector a component 2021-02-09 07:53:22 +03:00
Salman Ahmed
71e564d399 Revert clients to be Components 2021-02-09 07:46:00 +03:00
Dean Herbert
8204d360a8 Always reset local user settings when a mod is deselected in ModSelectOverlay 2021-02-09 13:44:42 +09:00
Dean Herbert
be379e0e3c Change CopyFrom to always overwrite all settings with incoming values 2021-02-09 13:44:11 +09:00
smoogipoo
3ce605b5e5 Small refactoring to use .Trim() instead 2021-02-09 12:00:03 +09:00
Salman Ahmed
f76f92515e Clean up spectator streaming client with new hub connector 2021-02-09 02:15:56 +03:00
Salman Ahmed
28b815ffe1 Clean up multiplayer client with new hub connector 2021-02-09 02:13:09 +03:00
Salman Ahmed
af345ea5db Add a SignalR hub client connector component 2021-02-09 01:52:35 +03:00
Salman Ahmed
cca1bac67d Pass empty user statistics for consistency
Realized `Statistics` was never giving null user statistics, so decided to pass an empty one here as well.
2021-02-08 22:00:52 +03:00
Salman Ahmed
d101add159 Display user global rank for selected ruleset in participants panel 2021-02-08 21:25:50 +03:00
Salman Ahmed
bebff61a9d Add method for retrieving condensed user statistics 2021-02-08 21:25:50 +03:00
Joehu
414e05affd Fix editor effect attribute tooltip having unnecessary whitespace when only one is enabled 2021-02-08 10:16:16 -08:00
Dean Herbert
b2b55ccc22
Merge branch 'master' into hit-policy-refactor 2021-02-09 00:22:26 +09:00