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

24387 Commits

Author SHA1 Message Date
Dean Herbert
05002ea3e8 Move Show/Hide code to PopIn/PopOut 2019-11-01 14:50:38 +09:00
Dean Herbert
dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d Fix GameplayClockContainer operating on beatmap's track after scren exited 2019-11-01 14:11:18 +09:00
Dan Balasescu
9b9366e2d7
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 13:55:28 +09:00
Dean Herbert
7c3dd36add
Fix scrolling hitobjects expiring too soon (#6687)
Fix scrolling hitobjects expiring too soon
2019-11-01 13:03:51 +09:00
Dan Balasescu
770726cc95
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 12:46:26 +09:00
Dan Balasescu
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
smoogipoo
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
Dean Herbert
fcba0c4fdf Merge branch 'game-handles-links' into fix-ios-import 2019-11-01 11:42:27 +09:00
Dean Herbert
f038c579f0 Protect against requests to show overlays before the target overlay is ready 2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dean Herbert
68cf23d3e4 Merge remote-tracking branch 'upstream/master' into fix-ios-import 2019-11-01 11:37:32 +09:00
Dan Balasescu
54681a6206
Merge branch 'master' into catch-api-request-exceptions 2019-11-01 11:33:23 +09:00
Dean Herbert
9443809063 Protect against requests to show overlays before the target overlay is ready 2019-11-01 11:22:32 +09:00
Dan Balasescu
c18cb354fd
Merge pull request #6682 from jai-x/improve-issue-templates
Improve issue templates
2019-11-01 11:06:41 +09:00
Jai Sharma
3ada1510d0 Remove 'missing-for-live.md' 2019-10-31 13:09:36 +00:00
Jai Sharma
08b1631dbb Add issue template config 2019-10-31 12:42:25 +00:00
Jai Sharma
ba65d0e4ee Force ordering of issue templates 2019-10-31 12:39:09 +00:00
Dean Herbert
e3ca64bb8c Remove iOS "import from stable" for now 2019-10-31 19:18:54 +09:00
Dean Herbert
f13dc93a4d Fix external link tooltip regression 2019-10-31 18:49:13 +09:00
Dean Herbert
11447023eb Improve splitting out of link handling 2019-10-31 18:35:24 +09:00
smoogipoo
41ae66d517 Update slider when control points change 2019-10-31 18:24:38 +09:00
smoogipoo
9f28b1905b Expose composer method to update hitobject 2019-10-31 18:15:19 +09:00
smoogipoo
18f374eec6 Deselect deleted control points 2019-10-31 17:58:33 +09:00
smoogipoo
78194cfa6e Implement slider control point deletions 2019-10-31 17:54:09 +09:00
Dean Herbert
83abb845b6 Fix code quality 2019-10-31 17:50:06 +09:00
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