Commit Graph

23953 Commits

Author SHA1 Message Date
0a481e9386 Merge pull request #5985 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2019.904.0
Bump ppy.osu.Game.Resources from 2019.903.1 to 2019.904.0
2019-09-04 13:38:28 +09:00
f86998c139 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.904.0' into fix-case-sensitive-lookups 2019-09-04 13:38:08 +09:00
fb3d050209 Add comprehensive configuration lookup tests 2019-09-04 13:36:50 +09:00
f655cd4516 Fix parsing of null configuration elements 2019-09-04 13:30:46 +09:00
04c2c33c64 Allow LegacySkin to be constructed with all nulls 2019-09-04 13:29:55 +09:00
9edfe6800f Bump ppy.osu.Game.Resources from 2019.903.1 to 2019.904.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.1 to 2019.904.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.1...2019.904.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-04 04:20:46 +00:00
024aa4dd7b Update resources 2019-09-04 13:05:05 +09:00
0875ec75a7 Merge pull request #5983 from peppy/handle-click-event
HoverClickSounds should handle click event instead of MouseUp
2019-09-04 12:55:10 +09:00
5efd455ce4 Fix taiko sample namespace 2019-09-04 12:47:10 +09:00
c88a5306aa Merge branch 'master' into handle-click-event 2019-09-04 12:38:48 +09:00
aad245c4e3 Merge pull request #5875 from Joehuu/fix-gameplay-menu-button-hover-ani
Fix gameplay menu button initial hover animation

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-04 12:26:52 +09:00
4c563232d6 HoverClickSounds should handle click event instead of MouseUp 2019-09-04 11:37:19 +09:00
7cbcc7b906 Further test refactors 2019-09-04 11:36:09 +09:00
40c61894ef Update some case sensitive resources lookups in-line with resources 2019-09-04 10:44:24 +09:00
1802d2efaf Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani 2019-09-04 10:35:14 +09:00
5c10a22877 Update tests to use [Test] attributes 2019-09-04 10:34:56 +09:00
9ec16bc2b2 Add test for initial button hover 2019-09-03 16:56:45 -07:00
04111cc3b7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-04 02:46:23 +03:00
08350a1aca Add parenthesis handling to old link format
Allow users to put both balanced round parentheses, as well as
unbalanced escaped ones, in old style link text. The implementation
is the same as for Markdown and new style links, except for swapping
all instances of

    \[\]

to

    \(\)

for obvious reasons (different type of parenthesis requiring escaping).
Tests also included.
2019-09-04 00:21:27 +02:00
f04add6d9e Add bracket handling to Markdown link format
Allow users to put both balanced brackets, as well as unbalanced
escaped ones, in Markdown link text. The implementation is the exact
same as in the case of new format links.

For completion's sake, tests also included.
2019-09-04 00:07:00 +02:00
24d4f0372c Refactor link parsing regexes to use named groups
For the sake of readability, consistency and to make further changes
easier, introduce named groups (?<text>) and (?<url>) to all link
parsing regexes which have parts containing the desired link text
and (optionally) URL.

The introduction of the named groups additionally simplifies
handleMatches() and makes all calls to it consistent.
2019-09-04 00:06:52 +02:00
a8f16503e2 Add backslash escaping to new link format
For users to be able to add square brackets inside of links using
the new format, the regular expression used for parsing those links
contained a balancing group, which can be used for matching pairs
of tokens (in this case, opening and closing brackets, in that order).
However, this means that users could not post links with unmatched
brackets inside of them (ie. ones that contain single brackets, or
a closing bracket and then an opening one). Allow for escaping opening
and closing brackets using the backslash character.

The change substitutes this old fragment of the regex in the display
text group:

    [^\[\]]*        // any character other than closing/opening bracket

for this one:

    (((?<=\\)[\[\]])|[^\[\]])*

The second pattern in the alternative remains the same; the first one
performs the escaping, as follows:

    (
        (?<=\\)     // positive lookbehind expression:
                    // this match will succeed, if the next expression
                    // is preceded by a single backslash
        [\[\]]      // either an opening or closing brace
    )

Since the entire display group is matched, unfortunately the lookbehind
expression does not actually strip the backslashes, so they are
manually stripped in handleMatches.

As demonstrated in the unit tests attached, this also allows balanced
brackets to be mixed with escaped ones.
2019-09-03 23:18:39 +02:00
f8c1afa539 Fix two more cases of judgements appearing on hit error display when they shouldn't 2019-09-03 20:17:39 +09:00
53fe290ef3 Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
8d52d282e9 Merge pull request #5928 from bdach/consistent-mod-button-sounds
Fix inconsistent sound effects on mod buttons

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-03 19:42:21 +09:00
4b2cb8854e Fix storyboard samples not stopping on exit 2019-09-03 19:28:10 +09:00
e98059267d Improve xmldoc 2019-09-03 19:21:24 +09:00
299d528654 Simplify implementation 2019-09-03 19:20:23 +09:00
e88965b433 Merge remote-tracking branch 'upstream/master' into consistent-mod-button-sounds 2019-09-03 19:18:59 +09:00
609adf4b59 Fix catch catcher lookups (#5964)
Fix catch catcher lookups

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-03 19:08:49 +09:00
343af28ed5 Add extra legacy skin parsing tests 2019-09-03 18:59:23 +09:00
f58ca82398 Don't include section for now 2019-09-03 18:56:01 +09:00
312e12e3b4 Add spacing to difficulty icons on direct panels (#5957)
Add spacing to difficulty icons on direct panels
2019-09-03 18:44:58 +09:00
858828d4ef Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher 2019-09-03 18:31:19 +09:00
002de80c30 Add xmldoc to ISkin 2019-09-03 18:30:22 +09:00
2f74ef5131 Add test for changing of a source 2019-09-03 18:22:51 +09:00
352fd3efda Bump ppy.osu.Game.Resources from 2019.903.0 to 2019.903.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.0 to 2019.903.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.0...2019.903.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 09:18:24 +00:00
097012dc95 Move slider ball colouring to DefaultLegacySkin for now 2019-09-03 18:05:16 +09:00
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
976f5020c0 Fix ring glow lookup being incorrect (#5963)
Fix ring glow lookup being incorrect

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-03 16:31:12 +09:00
3854bc68e0 Merge branch 'master' into fix-ring-glow-lookup 2019-09-03 16:14:07 +09:00
953ea83cb6 Merge pull request #5956 from Joehuu/center-icon-and-text-correctly
Center icon and text using anchor and origin instead of margin
2019-09-03 15:30:12 +09:00
b7f1efbf38 Merge branch 'master' into center-icon-and-text-correctly 2019-09-03 14:51:59 +09:00
d1cdf49dd5 Revert SkinnableSprite lookups to old behaviour 2019-09-03 14:21:54 +09:00
10862f40c6 Don't display hit errors for non-timed hitobjects (#5952)
Don't display hit errors for non-timed hitobjects

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-03 13:29:35 +09:00
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
4cad55cee6 Move hit windows lookup to DrawableRuleset 2019-09-03 13:05:03 +09:00
4f3511e8e9 Fix ring glow lookup being incorrect 2019-09-03 12:32:10 +09:00
93c3e5a072 Merge pull request #5893 from peppy/play-to-gameplay
Rename "play" resources to "gameplay"
2019-09-03 12:26:42 +09:00
de2d3121f7 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.0' into play-to-gameplay 2019-09-03 12:06:10 +09:00