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

23012 Commits

Author SHA1 Message Date
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Dean Herbert
4e80eda6da Add test coverage 2019-10-28 11:40:42 +09:00
Dean Herbert
45da22afe9 Add xmldoc and combine GroupAt / CreateGroup 2019-10-28 11:40:33 +09:00
Dean Herbert
2a6b3fd67c Disallow inserting a group if one already exists with the current time value 2019-10-28 11:40:10 +09:00
Dean Herbert
59d983b66e Allow binding to ControlPointInfo's Groups 2019-10-28 11:39:53 +09:00
Dean Herbert
10033239c7 Allow binding to ControlPointGroup's ControlPoints 2019-10-28 11:39:17 +09:00
Dan Balasescu
dd16b938cb
Merge pull request #6601 from peppy/equivalent-to
Replace local Equatable implementations with abstract EquivalentTo
2019-10-27 12:08:52 +09:00
Dan Balasescu
676460019d
Merge branch 'master' into equivalent-to 2019-10-27 11:51:05 +09:00
Dean Herbert
814b520e5e Avoid potential mis-cast in comparison 2019-10-27 11:35:45 +09:00
Dean Herbert
16e9b404b9
Add temporary mobile report moratorium issue template (#6614)
Add temporary mobile report moratorium issue template
2019-10-26 22:28:54 +09:00
Bartłomiej Dach
654890776d Add exemption for potential code contributors
Add an exemption clause allowing potential code contributors to submit
issues if they state they would like to work on them, and note that
mobile-related pull requests are still accepted.

Suggested-by: Dean Herbert <pe@ppy.sh>
2019-10-26 14:56:29 +02:00
Dean Herbert
474626c2b3
Refactor distance snapping to be handled by HitObjectComposer (#6599)
Refactor distance snapping to be handled by HitObjectComposer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-26 14:55:26 +09:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
Dean Herbert
4290a71f44 Add special case for timing points
Timing points can't fallback to defaults and must be added at least once.
2019-10-26 11:38:05 +09:00
Dean Herbert
9e5eed97c4
Fix not being able to drag non-snaked sliders (#6600)
Fix not being able to drag non-snaked sliders
2019-10-26 10:47:21 +09:00
Dean Herbert
7502b64541 Merge branch 'control-point-grouping' into no-auto-gen 2019-10-26 10:35:34 +09:00
Dean Herbert
d6a49b9e93 Add back autogeneration rules
Will be removed in https://github.com/ppy/osu/pull/6604
2019-10-26 10:25:37 +09:00
Bartłomiej Dach
dca8de5e6b Rephrase template description 2019-10-26 02:06:39 +02:00
Bartłomiej Dach
a724909c25 Add temporary mobile report issue template
Due to an overwhelming amount of mobile reports that are not actively
being worked on (neither by the core team, due to more pressing
priorities, nor by external contributors) and take up considerable time
to manage, add an issue template that aims to enforce a temporary
moratorium on accepting mobile issues.
2019-10-26 01:56:46 +02:00
Dean Herbert
7100319858 Fix incorrect control point retrieval in non-lookup cases 2019-10-26 08:31:41 +09:00
Dean Herbert
b52be3d639 Merge branch 'control-point-grouping' into no-auto-gen 2019-10-26 01:20:08 +09:00
Dean Herbert
d25f7f4c27 Correctly clear other lists 2019-10-26 01:19:23 +09:00
Dean Herbert
c031aeb14c Fix inspection 2019-10-26 00:06:05 +09:00
Dean Herbert
eefa411182 Merge branch 'control-point-grouping' into no-auto-gen 2019-10-25 23:15:25 +09:00
Dean Herbert
d4fed43be7 Merge branch 'equivalent-to' into control-point-grouping 2019-10-25 23:15:15 +09:00
Dean Herbert
e39016bf01 Fix known non-nulls 2019-10-25 20:04:27 +09:00
Dean Herbert
8baf569f59 Remove necessity of AutoGenerated flag 2019-10-25 19:58:42 +09:00
Dan Balasescu
2b7115f5fb
Merge pull request #6529 from EVAST9919/comments-vote-pill
Implement working VotePill for CommentsContainer
2019-10-25 19:56:03 +09:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Dean Herbert
e2f2638212 Replace local Equatable implementations with abstract EquivalentTo 2019-10-25 19:44:28 +09:00
Dan Balasescu
c2f6cd9c24
Merge branch 'master' into comments-vote-pill 2019-10-25 19:19:44 +09:00
Dan Balasescu
5a70431263
Merge pull request #6591 from bdach/markdown-inline-links
Add support for Markdown inline links
2019-10-25 19:19:14 +09:00
smoogipoo
a9ec6b2562 Fix testcase failure 2019-10-25 19:00:10 +09:00
Dan Balasescu
c9505f89dd
Merge branch 'master' into markdown-inline-links 2019-10-25 18:52:11 +09:00
Dan Balasescu
ad6e828571
Merge pull request #6598 from peppy/fix-datetime-results
Fix DateTime display sizing on results screen
2019-10-25 18:40:16 +09:00
smoogipoo
da6ee05dd6 Fix not being able to drag non-snaked sliders 2019-10-25 18:37:44 +09:00
Dan Balasescu
3692846367
Merge branch 'master' into snapping-refactor 2019-10-25 18:26:14 +09:00
smoogipoo
ccc45dea20 Add hitobject composer snapping test 2019-10-25 18:19:26 +09:00
smoogipoo
ae011e8ee8 Fix distance snap grid test scenes 2019-10-25 17:25:46 +09:00
smoogipoo
4ca6a5a0cc Interface the distance snap provider 2019-10-25 16:50:21 +09:00
smoogipoo
607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
Dean Herbert
e5b5d286fd Increase spacing to closer match the design 2019-10-25 12:48:34 +09:00
Dean Herbert
07f7944fc6 Fix DateTime display sizing on results screen 2019-10-25 12:22:19 +09:00
Bartłomiej Dach
661dfbefaf Change containment check to overlap
Due to scenarios wherein a formatted link ended up as part of a larger
raw link after parsing, change the containment check to an overlap check
and add appropriate tests for these edge cases.
2019-10-25 00:42:58 +02:00
Andrei Zavatski
85769982a0 Refactor LoadingButton 2019-10-24 17:49:34 +03:00
Andrei Zavatski
4f79ac8095 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill 2019-10-24 17:38:50 +03:00
Dean Herbert
58f19217f7
Fix drag box being incorrectly positioned for 1 frame (#6589)
Fix drag box being incorrectly positioned for 1 frame

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-24 23:16:54 +09:00
Dean Herbert
0b3c7f28af
Merge branch 'master' into fix-dragbox-first-frame 2019-10-24 23:01:32 +09:00
Dean Herbert
fa3350ce2d
Refactor blueprint movement and selection events (#6588)
Refactor blueprint movement and selection events
2019-10-24 22:58:03 +09:00
Bartłomiej Dach
cbd99cc767 Resolve link-in-link edge case
Testing with #6542 surfaced a crash scenario, caused by formatted links
that had URLs in the display text, for example

    [mean example - https://osu.ppy.sh](https://osu.ppy.sh)

In that case the outer Markdown link would get picked up once, and then
reduced to the link text when looking for other links, leading to it
being picked up again the second time when the raw link is found.

Add a check in the raw link parsing path that ensures that the found
URL is not a part of a bigger, pre-existing link.
2019-10-24 15:52:55 +02:00