RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,255 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

2138 Commits

Author SHA1 Message Date
Andrei Zavatski 5a72083c13 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-13 08:32:06 +03:00
Andrei Zavatski 99fc13b4d8 Update usage of the DismissableFlag 2019-09-12 19:34:58 +03:00
Andrei Zavatski 0142fcd07a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-12 19:29:05 +03:00
Andrei Zavatski 7ee01ee323 Use assignment instead of binding 2019-09-12 18:11:48 +03:00
Andrei Zavatski 4dd819c150 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-12 17:17:32 +03:00
Andrei Zavatski cafb5105bc Rename HeaderFlag to DismissableFlag 2019-09-12 16:44:15 +03:00
Dean Herbert 2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Dean Herbert 5f77236c01
Merge branch 'master' into closable-flag 2019-09-12 22:27:34 +09:00
Dean Herbert 68feedbd15 Fix unreported CI issue 2019-09-12 18:46:42 +09:00
Dean Herbert 09a0c9f4d2 Add key counter rewind tests 2019-09-12 18:10:50 +09:00
Dean Herbert 0cdf125c1e Handle key counter rewinding in a better way 
Use ElapsedFrameTime rather than storing state data
 2019-09-12 15:42:14 +09:00
Dean Herbert 158737e001 Remove FadeTime customisation 
Also adjusts fade transitions to feel better, especially in fast forward scenarios.
 2019-09-12 14:27:29 +09:00
Andrei Zavatski acdd26422d Implement Spotlights logic 2019-09-12 06:36:17 +03:00
Andrei Zavatski 0c6c8fdcd0 Implement RankingsHeader component 2019-09-12 05:53:18 +03:00
Andrei Zavatski b657e31f93 Merge dependent changes 2019-09-12 05:26:10 +03:00
Andrei Zavatski 4bfb681db6 CI fixes 2019-09-12 05:16:56 +03:00
Andrei Zavatski 581508b8e7 Implement RankingsRulesetSelector 2019-09-12 05:06:51 +03:00
Andrei Zavatski dbfbd1262f Implement HeaderTitle component for RankingsOverlay 2019-09-11 23:39:22 +03:00
Andrei Zavatski eee1cad760 Merge remote-tracking branch 'refs/remotes/origin/closable-flag' into rankings-title 2019-09-11 23:01:38 +03:00
Andrei Zavatski 41ad44791b Move RankingsScopeSelector to another namespace 2019-09-11 11:58:18 +03:00
Andrei Zavatski d610c90371 Add more tests 2019-09-11 10:43:51 +03:00
Andrei Zavatski 95828b07ef Implement HeaderFlag component for rankings overlay 2019-09-11 10:40:58 +03:00
Andrei Zavatski 1969c5b89b Apply suggetsted changes 2019-09-10 16:36:05 +03:00
Andrei Zavatski 6c2db8e4b0 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-10 16:33:08 +03:00
Dan Balasescu 4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards 2019-09-10 17:43:42 +09:00
Dan Balasescu b4f5f902eb
Merge branch 'master' into use-test-working-beatmap-in-details-area-tests 2019-09-10 17:24:25 +09:00
Andrei Zavatski 03bd7ca8e7 Implement RankingsScopeSelector 2019-09-10 04:20:32 +03:00
iiSaLMaN 22fabef344 Use TestWorkingBeatmap in BeatmapDetailsArea tests 2019-09-09 19:52:31 +03:00
Dean Herbert c6b8f2db77 Update historic licence header 2019-09-06 19:05:50 +09:00
Dean Herbert 374479f837 Add truncatino of long usernames in chat 2019-09-06 19:00:57 +09:00
Dean Herbert b89fb5cdf7 Fix failing test 2019-09-06 16:51:30 +09:00
Dean Herbert 6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail 2019-09-06 16:12:53 +09:00
Dean Herbert f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
Dean Herbert 9d0151f19f
Merge pull request #5969 from peppy/skin-configuration-refactor 
Refactor skin configuration lookups to be more flexible

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-05 17:28:37 +09:00
Dan Balasescu f729282c73
Merge branch 'master' into skin-configuration-refactor 2019-09-05 16:56:05 +09:00
smoogipoo 8e204ba2e9 Refactor tests 2019-09-05 16:55:28 +09:00
smoogipoo bda21998c4 Add helper method to make direct casts be used 2019-09-05 16:48:56 +09:00
Dean Herbert a1d7291ffa Fix pause menu keyboard navigation being affected by initial cursor hover 2019-09-05 16:31:10 +09:00
Dean Herbert c0bcbfd892 Merge branch 'master' 
Conflicts:
	osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
 2019-09-05 14:40:30 +09:00
Dean Herbert 4df6bd5477
Merge branch 'master' into use-dummy-api-for-overall-tests 2019-09-05 14:27:01 +09:00
Dean Herbert f7e417de02
Add test for changing of a source (#5968) 
Add test for changing of a source
 2019-09-05 14:06:25 +09:00
iiSaLMaN a1c580f27e Create "none selected" placeholder state 2019-09-05 05:56:21 +03:00
Dan Balasescu 1aead3cda8
Merge branch 'master' into brace-escaping-in-links 2019-09-04 13:57:39 +09:00
Dean Herbert 2983918f71 Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor 2019-09-04 13:40:41 +09:00
Dean Herbert 8d48cc3533 Fix filename 2019-09-04 13:40:36 +09:00
Dean Herbert fb3d050209 Add comprehensive configuration lookup tests 2019-09-04 13:36:50 +09:00
Dean Herbert 7cbcc7b906 Further test refactors 2019-09-04 11:36:09 +09:00
Dean Herbert 1802d2efaf Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani 2019-09-04 10:35:14 +09:00
Dean Herbert 5c10a22877 Update tests to use [Test] attributes 2019-09-04 10:34:56 +09:00
Joehu 9ec16bc2b2 Add test for initial button hover 2019-09-03 16:56:45 -07:00
Bartłomiej Dach 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
Bartłomiej Dach 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
Bartłomiej Dach 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
Dean Herbert 343af28ed5 Add extra legacy skin parsing tests 2019-09-03 18:59:23 +09:00
Dean Herbert 2f74ef5131 Add test for changing of a source 2019-09-03 18:22:51 +09:00
Dean Herbert bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dean Herbert 05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
smoogipoo ec8726e163 Merge remote-tracking branch 'origin/master' into background-beat 2019-09-03 11:35:20 +09:00
jorolf 3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
Joehu 3d1f051437 Move hover tests after key tests 2019-09-02 11:13:34 -07:00
Dean Herbert 09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert 1e7528c2b3 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-02 19:13:00 +09:00
smoogipoo 0c73c5acf3 Expose full hitobject rather than hit windows 2019-09-02 17:14:40 +09:00
Dean Herbert d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
smoogipoo f2bdf94a1d Add HitWindows to JudgementResult to indicate timing errors 2019-09-02 16:28:14 +09:00
Dean Herbert 0985b1679f Move enum to response class 2019-09-02 15:57:55 +09:00
Dean Herbert 3d551b08a9 Rename legacy actions 2019-09-02 15:57:23 +09:00
Dean Herbert 13fadec6ec Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-09-02 15:25:41 +09:00
Dean Herbert f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert 043034a6ce Merge remote-tracking branch 'upstream/master' into beatmapset-genre-language 2019-09-02 13:45:25 +09:00
Andrei Zavatski 264441d90c Fix broken test 2019-08-31 02:42:26 +03:00
dependabot-preview[bot] 2876588193
Bump NUnit3TestAdapter from 3.15.0 to 3.15.1 
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.0 to 3.15.1.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15...V3.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 13:36:31 +00:00
Dean Herbert 8f5dc06d55 Merge remote-tracking branch 'upstream/master' into accuracy-bar 2019-08-30 20:18:25 +09:00
smoogipoo 6fb8a6cdbe Fix testcases not working for OD10 2019-08-30 19:53:38 +09:00
smoogipoo 8b4976ad92 Remove unnecessary intermediate OD tests 2019-08-30 19:53:38 +09:00
Dean Herbert 8fc177b743 Fix namespacing and hitwindow source 2019-08-30 18:46:42 +09:00
Dean Herbert 741bd0a5cf Fix incorrect colour sizes and simplify alignment specification 2019-08-30 18:35:17 +09:00
Dean Herbert 54696eef39 Reverse display, add animation and reduce width 2019-08-30 17:06:23 +09:00
Dean Herbert 5f3e638499 Make test useful 2019-08-30 16:40:24 +09:00
Andrei Zavatski b7a75ef5e1 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-30 10:09:00 +03:00
Dean Herbert bdbfa7bd2f Fix class naming 2019-08-30 15:32:47 +09:00
Dean Herbert 1d77e3764d
Merge branch 'master' into accuracy-bar 2019-08-30 15:21:32 +09:00
Dean Herbert a15828ab25 Introduce the concept of SkinComponents 
Removes reliance on string lookups and better defines elements for introduction into database
 2019-08-30 14:55:52 +09:00
Dean Herbert dc1046bf0c Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 12:53:05 +09:00
smoogipoo 6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
StanR d303083179 Update to match api 2019-08-29 12:29:31 +03:00
Dean Herbert 98626018fd
Encapsulate editor hitobject additions/removals (#5878) 
Encapsulate editor hitobject additions/removals
 2019-08-29 18:20:24 +09:00
smoogipoo 7927b684d3 Hook up + use editor beatmap 2019-08-29 16:06:40 +09:00
StanR 3347ee8170 Merge branch 'master' into beatmapset-genre-language 2019-08-29 09:57:53 +03:00
Dean Herbert ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00
Dean Herbert b1f523dae3 Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-08-28 17:13:57 +09:00
Dean Herbert 7ea55a5cdd Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 16:36:20 +09:00
iiSaLMaN 18431a42e6 Resolve merge conflicts 2019-08-27 20:06:17 +03:00
Andrei Zavatski 7f0a4fbef9 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-27 15:11:55 +03:00
Dean Herbert 7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
smoogipoo 9e926d44c0 Obsolete legacy UpdateState() method 2019-08-27 16:09:47 +09:00
Dean Herbert 66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank 2019-08-27 14:44:16 +09:00
Dean Herbert 7885c79467 Make bindables private 2019-08-27 14:31:34 +09:00
Dean Herbert 69145eb83a
Merge branch 'master' into select-filters-persistence 2019-08-27 14:12:59 +09:00
smoogipoo fb8b5ee106 Add test 2019-08-26 16:31:46 +09:00