h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Code Issues Releases Wiki Activity
24,094 Commits 3 Branches 657 Tags 362 MiB
2c0694257c
Commit Graph

2040 Commits

Author SHA1 Message Date
Andrei Zavatski
508b26ac69 Implement basic layout 2019-09-07 07:31:07 +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
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
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
Andrei Zavatski
04111cc3b7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-04 02:46:23 +03: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
53fe290ef3
Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +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
91e3eeb1c0
Merge branch 'master' into beatmap-mod-selector 2019-09-02 21:35:42 +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
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
Dean Herbert
6e3a63dae8 Update tests 2019-08-26 12:31:51 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons 2019-08-24 17:34:58 +09:00
iiSaLMaN
830ddd6ed9 Use all rulesets for many difficulties test 2019-08-24 01:31:53 +03:00
iiSaLMaN
8584d3ba23 Add many difficulties beatmap direct panel to the tests 2019-08-24 00:31:36 +03:00
iiSaLMaN
67acf20805 Add test beatmap set with many difficulties 2019-08-23 18:31:53 +03:00
iiSaLMaN
d8535574d1 Pass sample info to Skin.GetSample 2019-08-23 14:32:43 +03:00
Lucas A
6ea10ada34 Fix visual tests. 2019-08-23 13:31:45 +02:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info 2019-08-22 14:30:26 +09:00
Andrei Zavatski
336f979480 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:39:28 +03:00
Dean Herbert
fd26ef739a Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-21 15:23:54 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Andrei Zavatski
c4344f3f7c CI fixes 2019-08-20 15:29:32 +03:00
Andrei Zavatski
832b365bd0 Add testing 2019-08-20 15:17:31 +03:00
Andrei Zavatski
9f64e09625 Move HitErrorDisplayOverlay back to the HUD 2019-08-20 08:45:51 +03:00
Andrei Zavatski
d337f9b482 DefaultHitErrorDisplay -> BarHitErrorDisplay 2019-08-20 08:03:17 +03:00
Andrei Zavatski
50c47568e4 Don't present Meh hit windows if it has no value 2019-08-19 22:45:27 +03:00
Andrei Zavatski
1bff103d32 CI fixes 2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d84523bc0 Add testing 2019-08-19 21:10:12 +03:00
Dean Herbert
3949d46383 Add test fix to other test 2019-08-16 13:46:08 +09:00
Dean Herbert
ff601eefe6 Fix failing test 2019-08-16 13:21:28 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
Lucas A
7d18132e61 Merge branch 'master' into news-overlay-header 2019-08-14 20:08:36 +02:00
David Zhao
480e489c44 add back missing loaded check 2019-08-14 12:51:43 +09:00
Dean Herbert
5886420a5d
Merge branch 'master' into back-button-part-2 2019-08-13 21:38:31 +09:00
Dean Herbert
8ce2c876bf
Merge branch 'master' into multi-room-update 2019-08-13 21:03:03 +09:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
David Zhao
4a28bdd384 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-13 12:26:12 +09:00
David Zhao
aa6f8757eb remove string param, move menu check to method, add const padding 2019-08-13 12:26:06 +09:00
Dean Herbert
4ccac60337 Merge remote-tracking branch 'upstream/master' into refactor-osd 2019-08-13 11:35:54 +09:00
Lucas A
87811afade Add missing licence headers to added files. 2019-08-12 20:16:41 +02:00
Dean Herbert
bd61642ac6
Merge branch 'master' into beatmap-mod-selector 2019-08-13 00:54:21 +09:00
Andrei Zavatski
16b6ed846f Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-08-12 14:46:24 +03:00
Lucas A
5e49d0fb28 Fix CI issues 2019-08-12 12:11:01 +02:00
Lucas A
6533f114d4 Apply review suggestions 2019-08-12 12:09:09 +02:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector 2019-08-12 15:48:53 +09:00
Andrei Zavatski
6095480a54 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-12 09:36:15 +03:00
Dean Herbert
31fe121fe9 Merge remote-tracking branch 'RedMindZ/master' into autopilot 2019-08-12 14:40:52 +09:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
iiSaLMaN
fe20e19243 Rename toggling steps 2019-08-11 23:21:05 +03:00
Salman Ahmed
bc32726f3c
Apply renaming suggestions 
Co-Authored-By: Dean Herbert <pe@ppy.sh>
 2019-08-11 23:08:14 +03:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd 2019-08-11 13:13:12 +09:00
Lucas A
b92e331730 Add tabcontrol logic to news overlay 2019-08-10 17:06:52 +02:00
Lucas A
4b0ac381b7 Add visual tests. 2019-08-10 15:39:13 +02:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
Dean Herbert
29870c773c
Merge branch 'master' into stop-counting-to-score-after-fail 2019-08-09 14:16:34 +09:00
smoogipoo
a9c4b5ac4e Add tests 2019-08-09 14:04:56 +09:00
iiSaLMaN
537973fc45 Add test for disabling user dim on storyboard 2019-08-08 15:59:29 +03:00
Andrei Zavatski
9ab132520c Testcase improvements 2019-08-08 12:25:46 +03:00
Andrei Zavatski
460cf141de Add testing 2019-08-08 12:18:26 +03:00
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
Andrei Zavatski
d9fd054102 Merge master with conflicts resolved 2019-08-07 16:05:28 +03:00
Andrei Zavatski
487979b016 Add Testing 2019-08-07 09:31:07 +03:00
David Zhao
cf9a5baafa Explicity dispose osuGame instances 2019-08-07 14:51:24 +09:00
Andrei Zavatski
a99d6536c2 CI fix 2019-08-07 08:49:04 +03:00
Andrei Zavatski
87974850dd Initial implementation 2019-08-07 08:42:43 +03:00
Andrei Zavatski
b064df91a7 Initial implementation 2019-08-07 08:33:55 +03:00
Andrei Zavatski
c591cb83eb Merge remote-tracking branch 'refs/remotes/ppy/master' into move-graph-data-to-statistics 2019-08-05 12:45:29 +03:00
Andrei Zavatski
cd7b6d2d27 TestCase improvement 2019-08-04 15:00:02 +03:00
Andrei Zavatski
d693a54c84 Move RankHistoryData to User Statistics 2019-08-04 14:35:26 +03:00
Andrei Zavatski
3ae5428dad ProfileRulesetSelector improvements 2019-08-04 14:15:16 +03:00
Andrei Zavatski
416f9d89db CI fixes 2019-08-03 05:49:01 +03:00
Andrei Zavatski
37be4fbf16 Use GridContainer for layout 2019-08-03 05:34:14 +03:00
Andrei Zavatski
f81238b8b1 Add online test 2019-08-03 04:45:41 +03:00
Andrei Zavatski
4c0a9aeab7 Add null user step 2019-08-02 07:44:09 +03:00
Andrei Zavatski
de96e5dfc6 Apply suggested changes 2019-08-02 07:41:11 +03:00
Andrei Zavatski
5547592768 CI fixes 2019-08-01 23:04:18 +03:00
Andrei Zavatski
90c59ab39d implement PreviousUsernamesContainer 2019-08-01 21:26:59 +03:00
David Zhao
6ab9f645a2
Remove usage of no longer needed property 2019-08-01 21:26:52 +09:00
David Zhao
d05b9b1734 Use dummyAPI and move load check into MusicController 2019-08-01 14:19:45 +09:00
iiSaLMaN
849ed0c69d Acquire api access for online tests 2019-07-31 22:44:44 +03:00
iiSaLMaN
034345f1bd Resolve API for dummy-caching tests 2019-07-31 22:43:05 +03:00
David Zhao
351b6e6259 Add new options test 2019-07-31 19:47:41 +09:00
David Zhao
980686f6bf get tests running again 2019-07-31 19:30:35 +09:00
David Zhao
f81e691bf5 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-31 16:03:14 +09:00
David Zhao
5aece2d5f2 fix tests 2019-07-31 16:03:05 +09:00
iiSaLMaN
f2ab259c21 Add an assert if current break index has skipped a break 2019-07-30 13:30:26 +03:00
iiSaLMaN
e6e315e07b Expose current break index 2019-07-30 13:29:41 +03:00
Dean Herbert
e8e5b2742d Fix manual clock usage 2019-07-30 18:31:57 +09:00
Dan Balasescu
6a66a3b06f
Merge branch 'master' into skinning-test 2019-07-30 18:28:56 +09:00
David Zhao
0291a708d4 fix step name and rename test 2019-07-30 18:18:03 +09:00
David Zhao
98bb6da975 rename test scene and create a new game each test 2019-07-30 18:16:17 +09:00
Dean Herbert
80aaa42f99
Move database isolation logic to OsuTestScene for easier reuse (#5502) 
Move database isolation logic to OsuTestScene for easier reuse
 2019-07-30 14:16:42 +09:00
Salman Ahmed
c8b7cf8672
Merge branch 'master' into add-bindable-for-break-times 2019-07-30 06:23:47 +03:00
David Zhao
9e809a2342 fix merge 2019-07-30 12:05:29 +09:00
David Zhao
d70b99b4c0 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-30 12:05:23 +09:00
David Zhao
6d1203a599 Move screen pushes into function, rename receptor 2019-07-30 12:00:04 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence (#5275) 
Improve testability of intro sequence
 2019-07-29 18:56:38 +09:00
David Zhao
e8c039bb8a Use a receptor model instead 2019-07-29 18:45:16 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes 2019-07-29 17:47:07 +09:00
Dean Herbert
c514cbe2b7 Add basic skinning test 2019-07-29 17:27:00 +09:00
David Zhao
8742ed8a9c Fix step names 2019-07-29 17:23:45 +09:00
Dean Herbert
c14c3ba8ec Move database isolation logic to OsuTestScene for easier reuse 2019-07-29 16:57:02 +09:00
David Zhao
2e242075b4 Remove and re-add backbutton instead and add tests 2019-07-29 16:42:23 +09:00
Dean Herbert
de8f502871 Add test 2019-07-29 02:46:33 +09:00
iiSaLMaN
c9e45f8cdc Assign clocks instead of creating 2 separate overlays 2019-07-28 09:27:02 +03:00
iiSaLMaN
37c3265942 Manually call the update function on retrieving IsBreakTime value 2019-07-28 09:21:54 +03:00
Dean Herbert
a24e57dd3d
Merge branch 'master' into refactor-osd 2019-07-28 13:10:01 +09:00
iiSaLMaN
4143bafd67 More simplifies 2019-07-28 05:22:09 +03:00
iiSaLMaN
4d49b38277 Add a function for loading a list of breaks 2019-07-28 05:21:27 +03:00
iiSaLMaN
46f17885c6 Rewrite break overlay test 2019-07-27 15:51:14 +03:00
iiSaLMaN
6fac716ec7 Use container instead of fill flow 2019-07-26 08:15:46 +03:00
Shane Woolcock
5e51012800 Rewrite updateBreakTimeBindable 2019-07-25 22:54:05 +09:30
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes 2019-07-24 18:37:31 +09:00
Andrei Zavatski
7a3afbd0b1 Merge remote-tracking branch 'refs/remotes/ppy/master' into songselect-best-user-score 2019-07-23 00:39:35 +03:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Dean Herbert
eca63980d2 Add comprehensive scaling mode tests 2019-07-22 14:43:07 +09:00
Dean Herbert
74c961bcff Add more flexible skin element confine modes 2019-07-22 14:42:56 +09:00
Dean Herbert
27258e3a9b Rename test scene to match class 2019-07-15 14:38:28 +09:00
Andrei Zavatski
c8192d6f3a Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-07-14 19:10:47 +03:00
Andrei Zavatski
a01e7260e0 Testcase fix 2019-07-14 16:49:46 +03:00
Andrei Zavatski
19680c8df8 Minor adjustments 2019-07-14 16:37:05 +03:00
Andrei Zavatski
ecf0e62484 CI fixes 2019-07-14 16:16:21 +03:00
Andrei Zavatski
963e025bb8 Make it works and some layout adjustments 2019-07-14 14:03:14 +03:00
Andrei Zavatski
d1409d4610 Add top score section into beatmap detail area 2019-07-14 13:33:47 +03:00
Andrei Zavatski
922c3c89ae Make leaderboard score use metric system 2019-07-14 12:47:35 +03:00
Andrei Zavatski
d30ae24f58 Use Bindable for setting score 2019-07-14 12:40:54 +03:00
Andrei Zavatski
0584ee9ce5 Basic implementation 2019-07-14 12:34:12 +03:00
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di 2019-07-12 23:14:12 +09:30
Lucas A
09d679de8d Move text display layout to Toast. 2019-07-12 08:50:53 +02:00
Dean Herbert
671f7f99cd Use constant for blur amount 2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16 Don't expose dimmable container creation in player 2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b Move classes to local namespaces 
Also renames test scene to more appropriate name.
 2019-07-12 11:50:06 +09:00
Dean Herbert
0d9f978857 Don't expose DimContainer 2019-07-12 11:38:15 +09:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements 2019-07-11 23:46:02 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability 2019-07-11 23:10:28 +09:00
StanR
cd7c03c13a Add genre and language sections to beatmapset overlay 2019-07-11 16:44:48 +03:00
Dean Herbert
2c62891c48 Make Toast base class abstract 2019-07-11 15:15:34 +09:00
Dean Herbert
3bc789fca8 Remove osd prefix and prefer upper-case OSD 2019-07-11 15:09:54 +09:00
David Zhao
6c0de0b436 Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-11 13:33:35 +09:00
David Zhao
321266e96f Make UserDimContainer abstract 2019-07-11 13:17:28 +09:00
Andrei Zavatski
953d32366c Move request inside the ScoresContainer again 2019-07-10 19:40:29 +03:00
Andrei Zavatski
a041421e0d Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-10 19:39:41 +03:00
Dean Herbert
e23d42522c
Merge pull request #5295 from peppy/fix-misc-inspections 
Fix a few inspections from EAP r#
 2019-07-11 00:56:18 +09:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score 2019-07-11 00:31:26 +09:00
David Zhao
221ee58f55 make storyboard text more visible 2019-07-10 12:36:58 +09:00
David Zhao
7929104b8a move default into StoryboardContainer, fix load bug, remove comment 2019-07-10 12:24:05 +09:00
Andrei Zavatski
9907a58ec4 Revert animations and apply suggested changes 2019-07-09 17:38:17 +03:00
Dean Herbert
a0d048ad8d Don't test the logo 
Breaks main menu adding
 2019-07-09 19:31:53 +09:00
Dean Herbert
2d0e6652f9 Ensure logo doesn't get stuck tracking 2019-07-09 18:59:56 +09:00
Dean Herbert
8eeba069cc Ensure logo isn't left in a bad state on re-run 2019-07-09 18:51:10 +09:00
Andrei Zavatski
276873ff8a remove unused field 2019-07-09 12:28:59 +03:00
Dean Herbert
e3e72a6276 Reorganise tests and add restart step 2019-07-09 18:21:43 +09:00
Andrei Zavatski
e8b9b1b0bf visibility logic adjustments 2019-07-09 12:16:58 +03:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
Dean Herbert
32fb811bc9 Merge branch 'master' into intro-testing-improvements 2019-07-09 18:05:52 +09:00
Andrei Zavatski
8d6af1625a Visibility improvements 2019-07-09 11:40:51 +03:00
David Zhao
89cb8a0cac Move storyboard initialization to new StoryboardContainer 2019-07-09 16:23:59 +09:00
Andrei Zavatski
eb4ef8f6ac CI fixes 2019-07-09 08:25:10 +03:00
Andrei Zavatski
5d81445454 Move api request outside the scores container 2019-07-09 08:05:34 +03:00
Andrei Zavatski
59cfd39670 Add testcase 2019-07-08 12:02:10 +03:00
iiSaLMaN
129899f419 Add a BPM property in BeatmapInfo 2019-07-08 10:43:35 +03:00
Dean Herbert
72362d92d4 Fix a few inspections from EAP r# 2019-07-08 16:34:11 +09:00
iiSaLMaN
90d5484818 Return BPM back to OnlineInfo 
Revert commit of "Move BPM out of OnlineInfo"
 2019-07-08 09:10:41 +03:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
iiSaLMaN
31e1d204d4 Add test for sorting by BPM and Length 2019-07-07 18:27:12 +03:00
Dean Herbert
cd31d2bc05 Simplify tests 2019-07-07 13:06:31 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder 2019-07-06 12:09:28 -07:00
Joehu
5767f4360e Remove unnecessary test checks 2019-07-06 12:07:13 -07:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
Dean Herbert
6bee26cfc9 Rename to match 2019-07-06 19:05:37 +09:00
Dean Herbert
58183ad3d5 Change intro test to test full intro screen 2019-07-06 19:05:12 +09:00
Dean Herbert
64de3840b0 Add missing wait step in TestScenePlayerLoader 2019-07-06 15:25:53 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
Lucas A
bc60b1dc13 Add test for empty OsdToast 2019-07-05 16:04:47 +02:00
Dean Herbert
39bd5e6478 Add test 2019-07-05 15:50:31 +09:00
Joehu
1534b75d27 Fix ci errors 2019-07-04 21:39:21 -07:00
Joehu
04ef6c4d45 Add beatmap status tests 2019-07-04 21:25:10 -07:00
David Zhao
4eb01b12be Convert to method 2019-07-05 13:10:59 +09:00
David Zhao
9eeafa0861 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
Dean Herbert
29bc2a2751 Split out tests 2019-07-05 11:29:47 +09:00
Dean Herbert
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
Dean Herbert
1b36860169 Fix test cross-talk 2019-07-04 19:26:12 +09:00
Dean Herbert
2dc356a24e Remove using 2019-07-04 18:47:43 +09:00
Dean Herbert
86e9d97b6a Adjust variables and test length to avoid random failures 2019-07-04 18:38:29 +09:00
Dean Herbert
73bc71f8b2 Use local clock to add consistency to skip times 2019-07-04 17:32:58 +09:00
David Zhao
07078b735c use new vector2 2019-07-04 17:06:28 +09:00
David Zhao
8e951d423f Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-04 17:05:47 +09:00
David Zhao
530675f364 Add tests as separate steps 2019-07-04 17:05:29 +09:00
Dean Herbert
db24ac28ec Add tests 2019-07-04 16:53:08 +09:00
Dean Herbert
4885f0f0c7 Add messaging telling users how to leave changelog comments 2019-07-04 15:47:06 +09:00
Andrei Zavatski
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI 2019-07-02 15:55:30 +05:30
Andrei Zavatski
2971bd8cbc Add disable trigger to a testcase 2019-07-02 13:22:38 +03:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4 2019-07-02 13:24:16 +09:00
Dean Herbert
e25158f434 Rename move and fix tests 2019-07-01 19:35:04 +09:00
Dean Herbert
5d94c67c76 Merge remote-tracking branch 'upstream/master' into selector-hiding 2019-07-01 18:49:18 +09:00
naoey
d8f6bbc90e
Disable replay button when replay is unavailable 2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes 2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container 
- Add license headers
- Slightly reduce bottom margin of button in score screen
 2019-06-29 12:26:37 +05:30
naoey
bc52f76556
Move replay button to score card 2019-06-29 10:55:30 +05:30
Dean Herbert
e8ea0594b4
Fix ruleset selector line not moving on first display (#5168) 
Fix ruleset selector line not moving on first display

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-06-28 00:52:11 +09:00
naoey
3cfa5a767f
Add test for download button states 2019-06-27 17:31:21 +05:30
smoogipoo
f6f547a91b Fix ruleset selector line not moving on first display 2019-06-27 18:25:38 +09:00
Dean Herbert
98ba38d421
Merge branch 'master' into user_profile_modes 2019-06-27 15:34:21 +09:00
smoogipoo
b397652af4 Remove ability to set arbitrary accent colours 2019-06-27 15:02:26 +09:00
smoogipoo
7f5587d894 RulesetTabItem -> ProfileRulesetTabItem 2019-06-27 14:54:31 +09:00
smoogipoo
803198ff20 Gamemode -> Ruleset 2019-06-27 14:53:18 +09:00
David Zhao
116a027ffa remove unused using 2019-06-27 14:51:59 +09:00
David Zhao
9d67a3f6a4 clean up ChannelManagerContainer 2019-06-27 14:42:04 +09:00
David Zhao
22ba697abe Recreate channel manager per test, delete broken tests 2019-06-27 13:50:02 +09:00
KingLuigi4932
04f5ee21e1 Merge remote-tracking branch 'origin/not-available-to-download' into not-available-to-download 2019-06-27 07:49:35 +03:00
iiSaLMaN
e78ecb9757 More anonymising in tests 2019-06-27 07:48:57 +03:00
smoogipoo
9e2e393ab7 DownloadAllowed -> DownloadEnabled 2019-06-27 13:38:21 +09:00
smoogipoo
c1277b5db2 Test the download button directly for safety 2019-06-27 13:35:14 +09:00
Dean Herbert
3294464bc6 Fix typo in variable 2019-06-27 12:47:05 +09:00
Dean Herbert
32c3bee71b Avoid public exposure 2019-06-27 12:11:04 +09:00
Dean Herbert
d6da21b0f0 Tidy up fetch methods 
Anonymise some test data further
 2019-06-27 12:00:31 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
Andrei Zavatski
e9f3a1ba63 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-26 18:31:36 +03:00
David Zhao
b00de0b3a8 Invert tests for now 2019-06-26 20:04:46 +09:00
David Zhao
e92c1ca009 Fix styling, private tabClosed, remove type check 2019-06-26 19:25:54 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
David Zhao
024d3cc10a Fix test and add comment 2019-06-26 18:00:40 +09:00
David Zhao
fe53df90af Merge branch 'selector-hiding' of https://github.com/nyquillerium/osu into selector-hiding 2019-06-26 17:54:02 +09:00
David Zhao
1e8026c3ae remove unused using 2019-06-26 17:53:57 +09:00
David Zhao
d1230b4a52 Use tabmap instead of available tabs 2019-06-26 17:53:35 +09:00
David Zhao
a1a0a9ee6b
Merge branch 'master' into selector-hiding 2019-06-26 17:45:05 +09:00
David Zhao
2394b11f11 fix test 2019-06-26 17:44:24 +09:00
David Zhao
1ca9717e13 Split out tests 2019-06-26 12:05:11 +09:00
David Zhao
6c8cc9728f fix channel selector not being closed 2019-06-26 12:00:58 +09:00
Salman Ahmed
2e383a1f83
Trim whitespaces 2019-06-26 05:17:28 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03:00
Salman Ahmed
33fbf56b4c
Remove test beatmapsets and use existing set info 2019-06-26 05:01:29 +03:00
Dean Herbert
c04f14a1e3 Remove unused using statement 2019-06-26 00:23:39 +09:00
Dean Herbert
a4214db39e Add test for pause via hold 2019-06-26 00:00:53 +09:00
Andrei Zavatski
08e31159fc Make testcase even more useful 2019-06-25 14:27:29 +03:00
Dean Herbert
e87e4077e8 Add testability of dismissal 2019-06-25 20:23:43 +09:00
smoogipoo
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo
4ed14a295d Make TLB test scene test TLB and not back button 2019-06-25 18:33:30 +09:00
iiSaLMaN
c76505c9c3 Use test beatmap sets instead of real info 2019-06-25 03:21:55 +03:00
Andrei Zavatski
35516e7304 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 22:52:24 +03:00
Dean Herbert
6a541d9a10
Merge branch 'master' into user_profile_modes 2019-06-25 00:59:51 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
024157b13f Remove unnecessary type specification 2019-06-24 11:10:29 +09:00
Dean Herbert
da2ba5bf09 Allow tests to be run in non-sequential order 2019-06-24 11:09:59 +09:00
Dean Herbert
4ec064e179 Fix test timing regressions due to increased step count 2019-06-24 11:00:00 +09:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
Unknown
cf193cb26f call MoveMouseTo with Drawable 2019-06-22 17:43:24 +02:00
Unknown
35d9f5841c simplify asserts, clarify asserts 2019-06-22 17:34:06 +02:00
Unknown
afe9ac1740 fix assert descriptions 2019-06-22 16:11:47 +02:00
Dean Herbert
667125a184
Fix ModSelectOverlay tests failing due to asynchronous loading (#5104) 
Fix ModSelectOverlay tests failing due to asynchronous loading

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
 2019-06-21 22:24:11 +09:00
Dean Herbert
859afefb79
Prevent non-combo affecting judgements from triggering sudden death (#5095) 
Prevent non-combo affecting judgements from triggering sudden death
 2019-06-21 22:24:00 +09:00
Unknown
16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download 2019-06-21 14:16:31 +03:00
Dean Herbert
c2b451a55f Fix ModSelectOverlay tests failing due to asynchronous loading 2019-06-21 17:51:25 +09:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain (#3491) 
Add tournament streaming and management toolchain
 2019-06-21 16:02:35 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Dean Herbert
19be83181f Add back missing test scene 2019-06-21 15:32:06 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Dean Herbert
f22d0fa1b4 Update test case for dynamic compilation and corret naming 2019-06-21 13:33:51 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
KingLuigi4932
eb9022257d Update direct panel test 2019-06-20 18:57:52 +03:00
Dean Herbert
fa94f063be Use correct button type 2019-06-21 00:26:55 +09:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
7b4180ce86 Fix failing test 2019-06-20 23:51:47 +09:00
Dean Herbert
8c383ddc27 Fix dodgy test scheduling to other tests 2019-06-20 19:23:27 +09:00
Dean Herbert
21a1fd738b Remove the necessity for NotificationOverlay to always be present 
Now it will only become present when there is a pending notification.
 2019-06-20 19:06:21 +09:00
Andrei Zavatski
e83710d3b8 Add a testcase 2019-06-19 23:15:00 +03:00
Dean Herbert
cd2999d0d1 Rename mod select test scene 2019-06-20 01:40:58 +09:00
KingLuigi4932
a9f87e06f8 Make field readonly 2019-06-19 19:08:18 +03:00
KingLuigi4932
4fba255bd9 Remove gap 2019-06-19 17:56:40 +03:00
KingLuigi4932
9f25d3cd72 More changes and improvements 2019-06-19 17:55:36 +03:00
Andrei Zavatski
e16de58450 Add a testcase 2019-06-19 12:34:01 +03:00
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +03:00
KingLuigi4932
3876442143 More simplifies + fix test 2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7 Revert some changes + simplify BeatmapNotAvailable 2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
Dean Herbert
7b68ac667b
Merge branch 'master' into tournament-tools 2019-06-18 20:20:13 +09:00
Dean Herbert
2d20c088f7 Remove test which is failing due to magic numbers 2019-06-18 18:31:42 +09:00
Andrei Zavatski
cecbcd21b2 Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor 2019-06-17 23:12:55 +03:00
Dean Herbert
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
Dean Herbert
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
smoogipoo
512b9dfd82 Fix potential songselect testcase failures 2019-06-14 20:18:22 +09:00
smoogipoo
0c293be89c Wait for track to start running before seeking 2019-06-14 19:51:31 +09:00
smoogipoo
95082d2fcc Rename testcase 2019-06-14 19:35:47 +09:00
smoogipoo
4972f862e6 Seek track instead 2019-06-14 19:35:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
smoogipoo
d8ef18c56a Remove unused using 2019-06-13 19:16:19 +09:00
smoogipoo
2ad4045b2e Refactor beatmap details testcase 2019-06-13 18:51:41 +09:00
smoogipoo
39f9deea96 Add success rate test scene 2019-06-13 18:44:00 +09:00
smoogipoo
f9f32311b7 Add some randomness 2019-06-13 18:43:44 +09:00
smoogipoo
f2b5f274cf Add details test scene + fix metrics not getting updated correctly 2019-06-13 18:31:39 +09:00
smoogipoo
72f729cf3b Refactor beatmap set overlay test scene 2019-06-13 18:14:57 +09:00
smoogipoo
f54f6e552b Fix beatmap details potentially using the incorrect metrics 2019-06-13 18:04:42 +09:00
smoogipoo
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52:49 +09:00
smoogipoo
aef94ce9f1 Make BeatmapMetrics non-IEnumerables 2019-06-13 16:30:38 +09:00
smoogipoo
f12caaf907 Increase leniency 2019-06-13 15:47:21 +09:00
smoogipoo
44d2514f1a Add test scene 2019-06-13 14:45:09 +09:00
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
EVAST9919
3150b5cfb4 Naming adjustments 2019-06-12 20:51:21 +03:00
KingLuigi4932
1a50544c94 Add tests for undownloadable / parts-removed beatmapsets 2019-06-12 20:42:52 +03:00
EVAST9919
065b4cd055 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-12 20:35:51 +03:00
Dean Herbert
021d0273f9
Split out user activity from user status (#4619) 
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-06-12 20:14:03 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
smoogipoo
243cd517ad Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
 2019-06-12 17:24:16 +09:00
smoogipoo
28f8b04765 Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 2019-06-12 16:47:56 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
bb8a77d27d Apply all steps to same user panel so interactions can be observed 2019-06-12 15:59:52 +09:00
smoogipoo
5d3fa51360 Merge remote-tracking branch 'origin/master' into selection-update 2019-06-12 15:10:57 +09:00
KingLuigi4932
529bde14af Merge branch 'not-available-to-download' of https://www.github.com/iiSaLMaN/osu into not-available-to-download 2019-06-11 23:11:52 +03:00
KingLuigi4932
35cc45c9d9 Small update 2019-06-11 23:11:03 +03:00
Lucas A
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
Dean Herbert
a690a67a6c
Merge branch 'master' into fullscreen-overlay-surface 2019-06-12 00:07:30 +09:00
KingLuigi4932
13cd22e397 Test scene for BeatmapNotAvailable 2019-06-11 14:58:46 +03:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert
86b6070ae8
Tween track frequency on pause (#4973) 
Tween track frequency on pause
 2019-06-11 18:44:56 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00