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

23604 Commits

Author SHA1 Message Date
Andrei Zavatski
e820ddd3e8 Implement settings keywords 2019-11-20 19:27:34 +03: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
Huo Yaoyuan
b1b234c6fb Use paramref. 2019-11-17 20:49:36 +08:00
Huo Yaoyuan
f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Huo Yaoyuan
5727963f86 Turn on xmldoc warning, and use appendive syntax for NoWarn. 2019-11-17 20:43:34 +08:00
Dean Herbert
e9e37fc821 Add private setter for FilterControl 2019-11-15 18:23:35 +09:00
Dean Herbert
296fff9243 Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-15 18:20:36 +09:00
Dan Balasescu
3e3427c3e8
Merge pull request #6846 from peppy/fix-mod-retention
Fix selected mods not being retained on exiting song select
2019-11-15 18:07:00 +09:00
Dean Herbert
813aebca1d Remove unintentional dependency 2019-11-15 14:51:01 +09:00
Dean Herbert
2c3109980a Fix broken merge 2019-11-15 13:51:39 +09:00
Dean Herbert
6d06b444ba Allow screen to specify whether to apply audio rate adjustments from mods 2019-11-15 13:47:14 +09:00
Dean Herbert
b8bb97607b Merge remote-tracking branch 'upstream/master' into fix-mod-retention 2019-11-15 13:46:44 +09:00
Dean Herbert
aa0feea3c3
Clean up carousel tests (#6834)
Clean up carousel tests

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-15 13:19:21 +09:00
Dan Balasescu
1fd6bf54d2
Merge branch 'master' into clean-carousel-tests 2019-11-15 12:12:43 +09:00
Dean Herbert
e81dfcad4c Fix remaining cases of pollution 2019-11-15 11:46:32 +09:00
Dean Herbert
20ab8f64c4
Fix database unique constraint issues on some imports (#6852)
Fix database unique constraint issues on some imports
2019-11-15 11:32:12 +09:00
Dean Herbert
22c3be2c6f Clear count variables on carousel creation 2019-11-15 11:26:01 +09:00
Dan Balasescu
644c581c92
Merge branch 'master' into fix-duplicate-online-ids 2019-11-15 11:12:06 +09:00
Dan Balasescu
af01d8ca34
Merge branch 'master' into clean-carousel-tests 2019-11-15 10:28:59 +09:00
Dan Balasescu
1d581b3073
Merge pull request #6847 from peppy/commit-on-focus-lost
Make settings textboxes commit on focus lost
2019-11-15 10:27:40 +09:00
Dean Herbert
0e587cb9f5 Merge branch 'master' into fix-duplicate-online-ids 2019-11-15 10:18:53 +09:00
Dean Herbert
6d54846462 Null online id on lookup failure 2019-11-15 10:18:47 +09:00
Dan Balasescu
cd9902cc9f
Merge branch 'master' into commit-on-focus-lost 2019-11-15 08:58:59 +09:00
Dan Balasescu
7b062b4de4
Merge pull request #6853 from peppy/dedupe-same-hash
Disallow .osu files with the same file content from being imported when in the same set
2019-11-15 08:50:37 +09:00
Dan Balasescu
22e46c560c
Merge branch 'master' into dedupe-same-hash 2019-11-15 08:31:46 +09:00
Dan Balasescu
5f7f32ecad
Merge pull request #6856 from gdalmau/patch-1
Add version badge to README
2019-11-15 08:31:37 +09:00
Dan Balasescu
a52aa88141
Merge branch 'master' into patch-1 2019-11-15 08:13:01 +09:00
Dan Balasescu
a1a0c0ef18
Merge pull request #6843 from huoyaoyuan/equals
Remove usages of untyped equality
2019-11-15 08:11:14 +09:00
Gerard Dalmau
8ae869b788
ADD version badge 2019-11-14 21:14:59 +01:00
Huo Yaoyuan
0998afdbdb Use ReferenceEquals instead of SequenceEqual. 2019-11-14 19:38:08 +08:00
Dean Herbert
12243aaa9a Dedupe .osu files with same hash in same set 2019-11-14 19:38:20 +09:00
Dean Herbert
9f62ec869a Add failing test 2019-11-14 19:38:20 +09:00
Dean Herbert
fbf81207d4 Don't assign server-fetched online id if it was assigned elsewhere 2019-11-14 18:55:12 +09:00
Dean Herbert
1bc0eae2a6 Fix beatmap online retrieval response running incorrectly scheduled 2019-11-14 18:53:45 +09:00