Commit Graph

23125 Commits

Author SHA1 Message Date
1e73cf1025 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-01 21:14:09 +03:00
036e67bbc2 Merge pull request #6676 from peppy/fix-multi-logout-crash
Fix multi logout crash
2019-11-01 17:13:16 +09:00
0820fde743 Hide resume overlay when re-pausing gameplay (#6611)
Hide resume overlay when re-pausing gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-01 15:57:12 +09:00
e23ea94383 Add one more level of null check 2019-11-01 15:33:38 +09:00
05002ea3e8 Move Show/Hide code to PopIn/PopOut 2019-11-01 14:50:38 +09:00
dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
d089e47a56 Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
9b9366e2d7 Merge branch 'master' into fix-multi-logout-crash 2019-11-01 13:55:28 +09:00
7c3dd36add Fix scrolling hitobjects expiring too soon (#6687)
Fix scrolling hitobjects expiring too soon
2019-11-01 13:03:51 +09:00
770726cc95 Merge branch 'master' into fix-multi-logout-crash 2019-11-01 12:46:26 +09:00
b0737535d1 Merge pull request #6677 from peppy/catch-api-request-exceptions
Cover all non-APIAccess APIRequest calls with exception handling
2019-11-01 12:36:42 +09:00
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
54681a6206 Merge branch 'master' into catch-api-request-exceptions 2019-11-01 11:33:23 +09:00
c18cb354fd Merge pull request #6682 from jai-x/improve-issue-templates
Improve issue templates
2019-11-01 11:06:41 +09:00
3ada1510d0 Remove 'missing-for-live.md' 2019-10-31 13:09:36 +00:00
08b1631dbb Add issue template config 2019-10-31 12:42:25 +00:00
ba65d0e4ee Force ordering of issue templates 2019-10-31 12:39:09 +00:00
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
ce19b2ed36 Avoid using CreateChildDependencies with a *child* bindable
Don't do this.
2019-10-31 17:16:26 +09:00
3e3ff81229 Reorder methods 2019-10-31 17:13:00 +09:00
4f04abf282 Fix tabs to match design (should not show pinhair line) 2019-10-31 16:54:28 +09:00
fe93df7186 Remove unnecessary using statement 2019-10-31 16:52:56 +09:00
5d47a2e557 Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
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
bf45fa6309 Use lambda function expression 2019-10-31 16:24:03 +09:00
f8187fa301 Don't rely on masking for bar display 2019-10-31 16:23:10 +09:00
923041c3f9 Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
0cd912fcd3 Cover all non-APIAccess APIRequest calls with exception handling 2019-10-31 15:04:13 +09:00
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
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
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
e4270dc57c Simplify EditorClock.Seek method (#6667)
Simplify EditorClock.Seek method
2019-10-30 19:26:43 +09:00
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
073066170c Merge pull request #6632 from peppy/bindable-control-points
Bindable control points
2019-10-30 18:32:12 +09:00
cf2d885099 Fix control points being flushed too late 2019-10-30 18:02:18 +09:00
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
514c9f1eef Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
7d61e5cfd5 Merge pull request #6635 from peppy/bindable-control-point-properties
Bindable control point properties
2019-10-30 16:20:10 +09:00
3045ba4bf4 Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
ced6042b3e Use internal type name 2019-10-30 15:51:09 +09:00
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
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
dbee63c1a6 Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
a03da25e05 Merge branch 'master' into fix-white-pixel 2019-10-30 12:35:22 +09:00
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
4322933470 Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
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
5c2917d303 Place sign in button inside ShakeContainer 2019-10-30 00:50:04 +07:00