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
53fe290ef3
Merge branch 'master' into back-button-part-2
2019-09-03 19:44:30 +09: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
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
Dean Herbert
67419aaf36
Merge branch 'master' into wrap-difficulty-icons-for-beatmap-set-overlay
2019-08-24 13:44:43 +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
dependabot-preview[bot]
72a644996c
Bump NUnit3TestAdapter from 3.14.0 to 3.15.0
...
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter ) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases )
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.14...V3.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 13:41:27 +00:00
iiSaLMaN
94b5caf740
Fix build issues
2019-08-23 15:18:56 +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
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
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
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
dependabot-preview[bot]
58e98e53d2
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0
...
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter ) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases )
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.13...V3.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00: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
Dan Balasescu
54ee0cabd8
Merge branch 'master' into beatmap-events
2019-08-08 14:25:41 +09: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
David Zhao
15a592e25e
Just assert doesn't throw and don't catch at LegacyDecoder
2019-08-07 19:25:40 +09: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
b064df91a7
Initial implementation
2019-08-07 08:33:55 +03:00
David Zhao
497d2cb677
shorten tests and rename
2019-08-06 12:35:18 +09:00
David Zhao
2c32d886d7
Add better asserts
2019-08-06 10:39:54 +09:00
David Zhao
b8c38d4dfd
remove unnecessary assert
2019-08-06 10:36:26 +09:00
David Zhao
a5c17ae26d
Don't use GetDecoder
2019-08-06 10:14:36 +09:00
David Zhao
cd6fe91882
Log error for invalid events
2019-08-06 10:05:21 +09: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
bb331106b2
Merge remote-tracking branch 'refs/remotes/ppy/master' into previous-usernames
2019-08-02 07:40:26 +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
smoogipoo
f2b940f930
Add tests
2019-08-01 17:31:37 +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