Commit Graph

2397 Commits

Author SHA1 Message Date
923041c3f9 Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
8d290a3242 Resolve CS0067. 2019-10-30 23:43:13 +08:00
5899bbd8a6 Fix merge regressions 2019-10-30 18:45:50 +09:00
93076ad6a1 Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +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
3045ba4bf4 Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
759395bcb5 CI fix 2019-10-30 04:31:09 +03:00
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
7f755fe726 Add more tests 2019-10-30 03:47:17 +03:00
f1a2643c40 Add test scene 2019-10-30 03:45:05 +03:00
04b0916196 Merge branch 'master' into fix-day-separator-purging 2019-10-29 18:44:39 +09:00
e1d0d78858 Fix chat not always scrolling to the bottom (#6649)
Fix chat not always scrolling to the bottom
2019-10-29 18:43:09 +09:00
3de45eb04a Fix loader animation tests failing occasionally (#6655)
Fix loader animation tests failing occasionally
2019-10-29 18:18:17 +09:00
342dfc26d2 Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom 2019-10-29 18:17:38 +09:00
e3a1613d2a Fix PlayerSettingsOverlay being shown by default (#6641)
Fix PlayerSettingsOverlay being shown by default
2019-10-29 18:16:33 +09:00
7c6ccce3ba Add tests covering precision case 2019-10-29 18:02:30 +09:00
8e1faf6ff1 Fix loader animation tests failing occasionally 2019-10-29 17:03:52 +09:00
f0f58c22d3 Merge branch 'master' into labelled-component-bindables 2019-10-29 16:32:57 +09:00
b06e70e546 Add failing test showing issue with day separator logic 2019-10-29 15:27:08 +09:00
d1c6e3f620 Add test for scroll to end when max history is exceeded 2019-10-29 14:32:52 +09:00
ecf14bc7b9 Rename class to match 2019-10-29 01:21:17 +09:00
46b44f4f99 Fix PlayerSettingsOverlay being shown by default 2019-10-28 18:37:58 +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
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
022cc13952 Add beatmap carousel item sorting stability test
Add visual test to ensure sorting stability when sorting criteria are
applied in the beatmap carousel.
2019-10-27 22:55:46 +01:00
0fba272e78 Add the ability to add new ControlPoint types to existing groups 2019-10-27 15:19:36 +09:00
349a2745c5 Merge remote-tracking branch 'origin/master' 2019-10-26 14:30:17 -05:00
9e2e87c8d1 added visual tests
added small commenting
added xmldoc for CancelResume();
2019-10-26 14:29:52 -05: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