1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 13:53:20 +08:00
Commit Graph

23671 Commits

Author SHA1 Message Date
Dean Herbert
76722534ec
Fix cancel button animating when entering a dialog (#6825)
Fix cancel button animating when entering a dialog

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 23:22:17 +09:00
Dean Herbert
561417e9dc
Handle SharpRaven deprecation (#6824)
Handle SharpRaven deprecation

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 23:11:54 +09:00
Dean Herbert
4475307707 Fix spacing 2019-11-21 22:55:31 +09:00
Dean Herbert
ac2dfffb23 Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation 2019-11-21 22:52:45 +09:00
Dean Herbert
f173961def
Add some extra search keywords to settings (#6893)
Add some extra search keywords to settings

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 22:51:20 +09:00
Dean Herbert
d7cb23a909 Remove redundant keyword 2019-11-21 22:51:00 +09:00
Dean Herbert
0f493aebef
Add slider control point deletion right-click menu item (#6832)
Add slider control point deletion right-click menu item

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 22:39:37 +09:00
Dean Herbert
8b1fb2d5a1 Standardise keyword specifications 2019-11-21 22:35:15 +09:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal 2019-11-21 22:10:52 +09:00
Dan Balasescu
59590c07ec
Merge pull request #6899 from peppy/use-managed-network-android
Switch android to using managed network components
2019-11-21 16:24:02 +09:00
Dean Herbert
9acfc2587a Switch android to using managed network components 2019-11-21 15:59:59 +09:00
Dean Herbert
f6b25ba2f7
Hook up multiplayer search filter (#6857)
Hook up multiplayer search filter

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 14:14:24 +09:00
Dean Herbert
2325f0382c Cancel a potentially pending filter update when an update occurs 2019-11-21 13:46:45 +09:00
Dean Herbert
4d6904468d Merge remote-tracking branch 'upstream/master' into multi-searching 2019-11-21 13:44:04 +09:00
Dean Herbert
0804d8d7a4
Replace all MathHelper.Clamp usages with Math.Clamp (#6891)
Replace all MathHelper.Clamp usages with Math.Clamp

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-21 11:14:34 +09:00
Dean Herbert
94009a22b8
Fix osu!direct previews muting game audio permanently (#6838)
Fix osu!direct previews muting game audio permanently

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 11:13:11 +09:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp 2019-11-21 11:08:56 +09:00
smoogipoo
0cbe29dbec Refactor / cleanup debouncing 2019-11-21 11:05:18 +09:00
Dean Herbert
19dfbb0a45 Update obsolete usages 2019-11-21 10:55:31 +09:00
Dan Balasescu
7d21118c77
Merge pull request #6890 from peppy/fix-song-select-scroll
Fix song select not always scrolling to the correct location
2019-11-21 10:53:33 +09:00
Dean Herbert
cf0f0f8a1b Reword comment 2019-11-21 10:37:50 +09:00
Dean Herbert
be62e48296 Fix tests not working if main or audio volume is zero 2019-11-21 10:35:10 +09:00
Dean Herbert
7637e680d7 Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping 2019-11-21 10:27:32 +09:00
Dean Herbert
76e63722cc Update framework 2019-11-21 10:26:10 +09:00
Dan Balasescu
ec35d92ec0
Merge branch 'master' into fix-song-select-scroll 2019-11-21 10:22:52 +09:00
Dean Herbert
31e58eb682
Merge pull request #6896 from iiSaLMaN/implement-aggregate-audio-adjustment-properties
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
2019-11-21 09:44:04 +09:00
iiSaLMaN
5391c752b4 Implement IAggregateAudioAdjustments properties for FallbackSampleStore 2019-11-21 03:20:08 +03:00
iiSaLMaN
ebae92db7b Revert "Implement IAggregateAudioAdjustments properties for FallbackSampleStore"
This reverts commit 4a4f5ccbb2.
2019-11-21 03:18:31 +03:00
iiSaLMaN
4a4f5ccbb2 Implement IAggregateAudioAdjustments properties for FallbackSampleStore 2019-11-21 02:35:58 +03:00
Andrei Zavatski
f066d8434c Apply suggestions 2019-11-21 00:26:39 +03:00
Andrei Zavatski
6b3010535f Simplify Keywords usage for SettingsSubsection 2019-11-20 21:03:31 +03:00
Andrei Zavatski
f3d9abc84a Capitalize Bar for consistency 2019-11-20 19:57:02 +03:00
Andrei Zavatski
7d8252183e CI fix 2019-11-20 19:42:57 +03:00
Andrei Zavatski
e820ddd3e8 Implement settings keywords 2019-11-20 19:27:34 +03:00
Berkan Diler
66a3837ff4 Fix CI 2019-11-20 14:25:44 +01:00
Berkan Diler
a36c2aa266 Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp 2019-11-20 13:40:30 +01:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Berkan Diler
6fec9826c6 Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp 2019-11-20 13:20:27 +01:00
Berkan Diler
da41b70d43 .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:19:49 +01:00
Berkan Diler
b7d5e36890 Remove unused Using directives 2019-11-20 13:18:03 +01:00
Berkan Diler
39d5ceb77d
Merge branch 'master' into math_clamp 2019-11-20 13:05:03 +01:00
Berkan Diler
6cace0c5f5 Replace all Mathhelper.Clamp usages with Math.Clamp 2019-11-20 12:43:14 +01:00
Dean Herbert
3ba9f840fd Fix song select not always scrolling to the correct location 2019-11-20 19:39:13 +09:00
Dean Herbert
a81c26577d
Fix carousel filtering twice on startup due to unpopulated rule… (#6833)
Fix carousel filtering twice on startup due to unpopulated ruleset
2019-11-20 19:39:00 +09:00
Dean Herbert
8d7be98b8b
Move to .NET Standard 2.1 (#6837)
Move to .NET Standard 2.1

Co-authored-by: Shane Woolcock <samahnub@gmail.com>
2019-11-20 17:57:00 +09:00
Dean Herbert
8c9ed99b1b Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-20 17:24:54 +09:00
Dean Herbert
5b416eb7ba Move initial filter to run on entering 2019-11-20 17:24:43 +09:00
Dean Herbert
74c034aee8
Fix crash when loading results after gameplay (#6886)
Fix crash when loading results after gameplay
2019-11-20 15:52:09 +09:00
Dean Herbert
e0f59d8e24 Move method 2019-11-20 15:43:00 +09:00
smoogipoo
6288e6da56 Add null check 2019-11-20 13:42:54 +09:00