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

23379 Commits

Author SHA1 Message Date
Dean Herbert
7207209404 Merge remote-tracking branch 'upstream/master' into fix-ios-import 2019-10-31 17:47:17 +09:00
smoogipoo
43b2cbb865 Implement slider control point deletion 2019-10-31 17:39:57 +09:00
Dean Herbert
2d807d0d12
Add ruleset selection to beatmap set overlay (#6394)
Add ruleset selection to beatmap set overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-31 17:35:15 +09:00
smoogipoo
20aeb7aaff Implement multiple selection 2019-10-31 17:25:30 +09:00
Dean Herbert
ce19b2ed36 Avoid using CreateChildDependencies with a *child* bindable
Don't do this.
2019-10-31 17:16:26 +09:00
smoogipoo
8d50b155e8 Make selection happen on click only 2019-10-31 17:13:10 +09:00
Dean Herbert
3e3ff81229 Reorder methods 2019-10-31 17:13:00 +09:00
Dean Herbert
4f04abf282 Fix tabs to match design (should not show pinhair line) 2019-10-31 16:54:28 +09:00
Dean Herbert
fe93df7186 Remove unnecessary using statement 2019-10-31 16:52:56 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
Dean Herbert
88cead2aab
Implement beatmap ruleset selector component (#6393)
Implement beatmap ruleset selector component

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-31 16:42:18 +09:00
Dean Herbert
bf45fa6309 Use lambda function expression 2019-10-31 16:24:03 +09:00
smoogipoo
e23a75c64a Implement control point selection 2019-10-31 16:23:54 +09:00
Dean Herbert
f8187fa301 Don't rely on masking for bar display 2019-10-31 16:23:10 +09:00
smoogipoo
7a3ebcd0b1 Fix path changes not updating tail circle 2019-10-31 15:52:38 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
Dean Herbert
0cd912fcd3 Cover all non-APIAccess APIRequest calls with exception handling 2019-10-31 15:04:13 +09:00
Dean Herbert
5b405abc52 Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6 Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room (#6666)
Fix crash when quickly exiting multiplayer after joining a room
2019-10-31 13:15:46 +09:00
Andrei Zavatski
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
Dean Herbert
35be8f9dfb Share framework file-exclusion function 2019-10-30 19:34:17 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen 2019-10-30 19:27:24 +09:00
Dean Herbert
e4270dc57c
Simplify EditorClock.Seek method (#6667)
Simplify EditorClock.Seek method
2019-10-30 19:26:43 +09:00
Dean Herbert
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
Dean Herbert
5899bbd8a6 Fix merge regressions 2019-10-30 18:45:50 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +09:00
Dan Balasescu
073066170c
Merge pull request #6632 from peppy/bindable-control-points
Bindable control points
2019-10-30 18:32:12 +09:00
smoogipoo
cf2d885099 Fix control points being flushed too late 2019-10-30 18:02:18 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dan Balasescu
7d61e5cfd5
Merge pull request #6635 from peppy/bindable-control-point-properties
Bindable control point properties
2019-10-30 16:20:10 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name 2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Dean Herbert
d7ea264ef4
Fix 1x1 white pixel appearing in the centre of hitcircles on de… (#6658)
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-30 12:43:55 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dan Balasescu
a03da25e05
Merge branch 'master' into fix-white-pixel 2019-10-30 12:35:22 +09:00
Dan Balasescu
7204ecf166
Merge pull request #6662 from GSculerlor/signin-ux-improvement
Add feedback to user when sign in form isn't filled
2019-10-30 12:35:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
Dan Balasescu
53b85c1681
Merge pull request #6653 from peppy/fix-day-separator-purging
Fix day separators never being removed from chat history
2019-10-30 12:03:41 +09:00
Andrei Zavatski
759395bcb5 CI fix 2019-10-30 04:31:09 +03:00
Andrei Zavatski
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
Andrei Zavatski
7f755fe726 Add more tests 2019-10-30 03:47:17 +03:00
Andrei Zavatski
f1a2643c40 Add test scene 2019-10-30 03:45:05 +03:00
Andrei Zavatski
2c31492bbe Fix comment can be voted if user is null 2019-10-30 03:27:06 +03:00