Commit Graph

2318 Commits

Author SHA1 Message Date
a91ffdaad9 Merge branch 'labelled-component-bindables' into editor-timing-screen-2 2019-10-29 01:21:30 +09:00
ecf14bc7b9 Rename class to match 2019-10-29 01:21:17 +09:00
08040adfad Expose Current bindable in LabelledComponents
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 16:24:28 +09:00
d33b31f0c5 Expose Current bindable in LabelledComponents
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 15:33:08 +09:00
1953aa64b6 Merge branch 'bindable-control-points' into editor-timing-screen 2019-10-28 12:00:51 +09:00
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
4e80eda6da Add test coverage 2019-10-28 11:40:42 +09:00
cd4b7c04e9 Add test coverage 2019-10-28 11:34:41 +09:00
0fba272e78 Add the ability to add new ControlPoint types to existing groups 2019-10-27 15:19:36 +09:00
194e501f86 Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
51008cd215 Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-26 11:20:17 +09:00
8ccff0e9cf temp 2019-10-26 11:20:07 +09:00
32242f22de Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-25 20:02:40 +09:00
8baf569f59 Remove necessity of AutoGenerated flag 2019-10-25 19:58:42 +09:00
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
da6769f0fc Remove necessity of AutoGenerated flag 2019-10-25 19:43:38 +09:00
94ffe03e6e Group timing points 2019-10-25 19:36:12 +09:00
c2f6cd9c24 Merge branch 'master' into comments-vote-pill 2019-10-25 19:19:44 +09:00
a9ec6b2562 Fix testcase failure 2019-10-25 19:00:10 +09:00
ccc45dea20 Add hitobject composer snapping test 2019-10-25 18:19:26 +09:00
ae011e8ee8 Fix distance snap grid test scenes 2019-10-25 17:25:46 +09:00
607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
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
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
a89ea78a7a Add extended testing for Markdown links
While reviewing #6542 it became apparent that there was another Markdown
link format variant, used in comments that came from the web API, called
the "inline link" style. It allows to specify the tooltip title within
the actual URL portion, as such:

    [link text](https://osu.ppy.sh "tooltip text")

Add tests with a couple of easy and trickier examples of such a format.
Moreover, add a new edge case of a Markdown link with a link inside
the display text, which during tests was detected to be problematic.
2019-10-24 15:52:55 +02:00
d83b9ef0e4 Rename grid snapping methods 2019-10-24 18:18:04 +09:00
40c202c394 Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
6866d27634 Merge remote-tracking branch 'upstream/master' into editor-timing-screen 2019-10-23 11:18:42 +09:00
25601ac17c Merge branch 'master' into editor-timing-screen 2019-10-22 18:01:53 +09:00
a3ab6d33c1 Add test 2019-10-22 01:37:30 +03:00
0fbba9a5e5 Split out more classes 2019-10-20 23:42:13 +09:00
7dc65ec964 Add missing required types 2019-10-20 23:32:49 +09:00
266f9a065f Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill 2019-10-18 19:25:05 +03:00
89f50b26f7 Fix hitobject combo colour potentially not getting adjusted 2019-10-18 17:32:11 +09:00
f22ec6f5bd Merge branch 'master' into editor-timing-screen 2019-10-18 16:57:46 +09:00
99ea45da41 Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
bd57c0b58e Merge branch 'master' into fix-incorrect-beatmap-set-info-equality 2019-10-17 19:51:03 +09:00
f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +09:00
3a6a25ffe8 Merge branch 'master' into non-static-rulesetstore 2019-10-17 14:25:06 +09:00
40fc655b50 Add equality check test to ensure correct values 2019-10-17 01:19:50 +03:00
12cd57744b Make RulestStore initialise at construction time 2019-10-15 16:14:06 +09:00
42a06a54ff Don't use ProfileShowMoreButton in the test scene to avoid confusion 2019-10-15 01:08:23 +03:00
09621f066e Childs -> Children 2019-10-15 00:32:21 +03:00
7cd3f5656d Cleanups 2019-10-14 16:43:43 +03:00
7ac87494e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-14 16:21:34 +03:00
89f270a19a SortSelector -> SortTabControl 2019-10-14 21:32:41 +09:00
ae1a361f9f Merge branch 'master' into commenst_header 2019-10-14 21:20:05 +09:00
2f209d1dfa Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 14:53:41 +03:00
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00