1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 12:52:54 +08:00
Commit Graph

24467 Commits

Author SHA1 Message Date
Andrei Zavatski
745047fd19 Remove useless line from ModIcon 2019-11-22 05:10:47 +03:00
Andrei Zavatski
da425c93fa Fix beatmap switch doesn't trigger scores update 2019-11-22 05:08:50 +03:00
Andrei Zavatski
dee9ffc694 Merge master with conflicts resolved 2019-11-22 04:59:46 +03:00
Dean Herbert
d8260f4a65 Reduce carousel scroll motion on initial display 2019-11-22 10:51:49 +09:00
Dean Herbert
337112834b
Create a control for filtering mods on a leaderboard (#5634)
Create a control for filtering mods on a leaderboard

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 10:47:16 +09:00
Dean Herbert
e170cd2892 Move private methods below 2019-11-22 10:29:16 +09:00
Dean Herbert
ced0ad404e
Merge branch 'master' into beatmap-mod-selector 2019-11-22 10:17:40 +09:00
Dean Herbert
88cb1fc705
Add option to show beatmap backgrounds at main menu (#6239)
Add option to show beatmap backgrounds at main menu

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 02:55:42 +09:00
Dean Herbert
57d38c5c74 Add final newline 2019-11-22 02:39:54 +09:00
Dean Herbert
ab42fac43a Improve naming 2019-11-22 02:38:31 +09:00
Andrei Zavatski
eb2f7c1d0a Rename forgotten variable 2019-11-21 20:37:02 +03:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Andrei Zavatski
c7c8527f5f Remove OnHighlightedChanged function 2019-11-21 20:22:15 +03:00
Andrei Zavatski
e22a71c6b8 Add visual difference between hovered and selected states 2019-11-21 19:42:07 +03:00
Huo Yaoyuan
8239c2da61 Refactor to avoid using try-finally as control flow. 2019-11-22 00:12:03 +08:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Andrei Zavatski
23fc7b1987 Implement updateHighlighted method 2019-11-21 19:02:24 +03:00
Andrei Zavatski
984ec11a78 Make Ruleset a bindable 2019-11-21 18:56:48 +03:00
Huo Yaoyuan
20f01ff3e9 Revert false positives of 'unused assignment'. 2019-11-21 23:54:38 +08:00
Andrei Zavatski
737c2bd1c8 Remove pointless const 2019-11-21 18:50:29 +03:00
Andrei Zavatski
458496206c Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
0d4854ac09
Add News Overlay skeleton and header (#5726)
Add News Overlay skeleton and header

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 00:14:31 +09:00
Dean Herbert
1a6b5e8714
Implement TotalCommentsCounter component for CommentsContainer (#6867)
Implement TotalCommentsCounter component for CommentsContainer
2019-11-21 23:45:23 +09:00
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
Dean Herbert
71a64da566 Fix test regressions 2019-11-21 22:07:37 +09:00
Dean Herbert
bd6831624a Decouple skip button animations from gameplay clock 2019-11-21 19:51:22 +09:00
Dean Herbert
ffd0e17826 Merge branch 'skip-multiple-times' into lead-in-fixes 2019-11-21 19:01:28 +09:00
Dean Herbert
46a94821d4 Add support for consecutive skips 2019-11-21 18:59:55 +09:00
Dean Herbert
442d9496c7 Merge remote-tracking branch 'swoolcock/master' into lead-in-fixes 2019-11-21 18:51:00 +09:00
Dean Herbert
8d1b11d4bd Add storyboard lead-in tests 2019-11-21 18:50:54 +09:00
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
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
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