RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,654 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

23654 Commits

Author SHA1 Message Date
Dean Herbert 4e53bca8dd Simplify tests 2019-11-21 18:50:38 +09:00
Dean Herbert 29d2374928 Add back skip button actuation count tests 2019-11-21 17:23:52 +09:00
Dean Herbert 2dd2e3d861 Add correct AudioLeadIn support 2019-11-21 16:55:18 +09:00
Dean Herbert 586e31efc2 Update tests 2019-11-21 15:56:08 +09:00
Dean Herbert 8369be90f2 Allow skip button to actuate more than once 2019-11-21 15:19:06 +09:00
Dean Herbert c0b9bb5a12 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-21 14:22:17 +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
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
smoogipoo 76ed573c56 Fix crash when loading results after gameplay 2019-11-20 12:21:49 +09:00
Huo Yaoyuan b5c20fecee Merge branch 'master' into netstandard2.1 2019-11-19 21:40:12 +08:00
Shane Woolcock 465c8c2618 Re-add package references to osu.iOS.props 2019-11-19 13:47:29 +09:00
Dan Balasescu 7eaafe63cb
Merge pull request #6872 from huoyaoyuan/xml-doc-fixes 
Fix bad references in xml doc
 2019-11-19 12:12:53 +09:00
Huo Yaoyuan efbab54206 Bump Android test projects version. 2019-11-18 18:48:29 +08:00
Huo Yaoyuan 608785b99a Update .Net Standard projects to 2.1 2019-11-18 18:35:58 +08:00
Huo Yaoyuan 140278bf4c Bump Xamarin.Android version to 10.0 2019-11-18 18:35:58 +08:00
Huo Yaoyuan 53bc2dcab7 Use costum displaying text for inherited references. 2019-11-18 15:29:18 +08:00
Huo Yaoyuan 4d1513cef6 Sadly, xmldoc doesn't support tuple elements. 2019-11-17 21:01:56 +08:00
Huo Yaoyuan b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00