1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 00:07:25 +08:00
Commit Graph

23914 Commits

Author SHA1 Message Date
Dean Herbert
296fff9243 Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-15 18:20:36 +09:00
Andrei Zavatski
f2862e95e0 CI fix 2019-11-15 12:15:51 +03:00
Andrei Zavatski
e51fd00d58 CI fix 2019-11-15 12:09:31 +03: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
Andrei Zavatski
18f77008db Update dependency 2019-11-15 12:04:01 +03:00
smoogipoo
10287eb66d Add debounce logic in several places 2019-11-15 17:58:47 +09:00
Andrei Zavatski
9fd225bda7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new 2019-11-15 11:58:05 +03:00
Andrei Zavatski
2592a0489b Use existing ModNoMod 2019-11-15 11:57:40 +03:00
Andrei Zavatski
1218d41b50 Make Ruleset a property 2019-11-15 11:52:49 +03:00
smoogipoo
1b4bcb81c8 Fix filtering breaking on secondary filters 2019-11-15 17:49:02 +09:00
Andrei Zavatski
b7efc276f1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-15 11:42:32 +03:00
Dean Herbert
813aebca1d Remove unintentional dependency 2019-11-15 14:51:01 +09:00
Dean Herbert
dbfec215e7 Improve test quality 2019-11-15 14:47:28 +09:00
Dean Herbert
c7d0b88854 Update test scene 2019-11-15 14:15:09 +09:00
Dean Herbert
eee5902851 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-15 14:05:31 +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
smoogipoo
f0b7b2e1c4 Fix broken test case 2019-11-15 11:07:16 +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
smoogipoo
956fb9912d Hook up multiplayer search filter 2019-11-15 08:23:56 +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
iiSaLMaN
8f02e57d1f Add test ensuring correct muting behaviour 2019-11-15 01:08:40 +03: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
iiSaLMaN
08e9813192 Add test ensuring correct changing behaviour 2019-11-14 14:23:52 +03:00
iiSaLMaN
d2ce0878bc Change 'current' accessibility to protected 2019-11-14 14:20:29 +03:00
iiSaLMaN
4e79bbad6b Add inline comment 2019-11-14 14:19:42 +03: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
Dean Herbert
81033e1fdf Add extra logging 2019-11-14 18:52:07 +09:00
Huo Yaoyuan
677717875e Change a case to EqualityComparer.Default to handle null properly. 2019-11-14 17:35:02 +08:00
Huo Yaoyuan
f25b1ba06f Merge branch 'master' into equals 2019-11-14 17:33:44 +08:00
Dean Herbert
1f4bf34238
Merge pull request #6836 from peppy/fix-double-background-load
Fix background loading twice when entering song select
2019-11-14 16:36:31 +09:00