h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 12:42:56 +08:00
Code Issues Releases Wiki Activity
27,616 Commits 6 Branches 666 Tags 359 MiB
2f5dc93d61
Commit Graph

2685 Commits

Author SHA1 Message Date
Dean Herbert
43903b2fea Make test scene usable 2020-01-02 14:24:58 +09:00
Andrei Zavatski
2d6a07e970 Fix OverlayRulesetSelector don't have default colour 2020-01-01 23:14:26 +03:00
Andrei Zavatski
b016238c16 Make ProfileRulesetSelector inherit from OverlayRulesetSelector 2020-01-01 22:55:28 +03:00
Andrei Zavatski
af248457b0 Implement OverlayRulesetSelector 2020-01-01 22:49:04 +03:00
Dean Herbert
2d6482f586 Fix remaining tests 2020-01-02 01:43:37 +09:00
Dean Herbert
f09f9eb07d Merge branch 'master' into general-editor-beatmap 2020-01-01 23:27:08 +09:00
Dean Herbert
ca90f708f1 Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics 2020-01-01 21:03:31 +09:00
Viktor Rosvall
f40ebc83ca Begun refractorization process of wrapping Button text in a FillFlowContainer 2019-12-30 23:58:49 +01:00
smoogipoo
8c378dc625 Move EditorBeatmap construction/conversion to Editor 2019-12-30 14:51:14 +09:00
Viktor Rosvall
e85910c4e4 removed unnecessary test code 2019-12-29 09:18:27 +01:00
Viktor Rosvall
bf463fe5e0 adjusted the margin values 2019-12-29 08:57:14 +01:00
Bartłomiej Dach
d828b31ae4 Schedule child mutation in test setup 2019-12-27 17:16:43 +01:00
Bartłomiej Dach
e2a55b79ca Refactor scrolling hit object scene 
To better demonstrate the desired effect of the fix introduced in
193e41f, refactor TestSceneScrollingHitObjects to contain two tests,
one of which contains the pre-existing controls to test scroll
algorithms, and the other aims to showcase the fix by setting scroll
parameters appropriately.
 2019-12-27 16:52:07 +01:00
smoogipoo
6069d98ced Remove generic editor beatmap 2019-12-27 19:39:30 +09:00
Dean Herbert
acef2b50e6
Merge branch 'master' into scrolling-container-origin-adjust 2019-12-27 09:29:06 +09:00
Bartłomiej Dach
fd8c5d7706 Improve notification overlay test robustness 
Stress testing one of the notification overlay tests by running it 10000
times on repeat has shown that it is susceptible to intermittent
failures due to races between delays and asserts checking the number of
currently progressing notifications and the actual progress update,
which contains a random generation factor.

Replace step sequences checking for notification completion by waiting
and asserting with explicit until steps that don't terminate unless
there are zero progressing notifications.
 2019-12-26 23:01:31 +01:00
Bartłomiej Dach
005ec4b373 Demonstrate bug in scrolling container scene 
Modify TestSceneScrollingHitObjects to showcase the effect of origin
choice on object lifetime for all four scrolling directions.
 2019-12-26 20:37:06 +01:00
smoogipoo
00a36c388c Fix tests 2019-12-26 19:18:39 +09:00
smoogipoo
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor 
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
 2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
Dean Herbert
0677f746aa Provide the ruleset to converter classes 2019-12-24 16:02:16 +09:00
smoogipoo
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
Dean Herbert
69227d6179 Add asserts 2019-12-22 06:37:18 +09:00
Dean Herbert
725008286f Move test and remove pointless duplicate tests 2019-12-22 06:09:16 +09:00
Andrei Zavatski
5af1260094 Improve testing 2019-12-21 14:30:49 +03:00
Dean Herbert
02d3f0f241
Merge branch 'master' into settings-source-value-changed 2019-12-21 19:40:07 +09:00
Willy Tu
8353c893c0 Update BodyText of LocalScoreDeleteDialog 2019-12-20 12:00:10 -08:00
Willy Tu
a55e5c5c43 Removed unnecessary code 2019-12-20 11:16:54 -08:00
Dean Herbert
df14f473c2 Split tests out 2019-12-20 19:52:54 +09:00
Willy Tu
ad41a5cc57 Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-20 02:14:01 -08:00
Willy Tu
ba2cff60ca Removed Automation Testing steps for delete local scores. Only manual testing now. 2019-12-20 02:13:49 -08:00
Willy Tu
afc11aa547 Fixed issues caused by renaming variables 2019-12-19 22:37:09 -08:00
Willy Tu
6672cf6059 Update variable name 2019-12-19 22:22:46 -08:00
Willy Tu
6abbd33b51 Fixed CI issues 2019-12-19 21:57:14 -08:00
Willy Tu
e42894cfcf Fixed error for CodeFactor 2019-12-19 21:32:54 -08:00
Willy Tu
8ab26e8889 Update Tests with dependencies on LeaderboardScore. Added its dependency on DialogOverlay for the tests. Added test for deleting individual local score 2019-12-19 21:29:54 -08:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
Dean Herbert
81e842f6b4 Fix waveform test beatmap accessing zip archive across multiple threads 2019-12-19 19:48:48 +09:00
smoogipoo
4e11fb0fd7 Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text 2019-12-18 19:36:16 +09:00
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings 
Display current difficulty statistics with mods applied
 2019-12-18 18:43:49 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param 
Remove RulesetInfo parameter from Ruleset constructor
 2019-12-18 18:42:42 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings 2019-12-18 17:59:27 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
Dean Herbert
54572b6de9 Update selected mdos references 2019-12-18 16:42:18 +09:00
Dean Herbert
7831e6ed33
Implement NewsArticleCover class (#7192) 
Implement NewsArticleCover class
 2019-12-18 16:15:23 +09:00
Dean Herbert
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +09:00
Lucas A
ad7923f9b9 Fix test methods not being renamed. 2019-12-17 19:25:17 +01:00
Lucas A
0a278ef943 Apply review suggestions 2019-12-17 19:23:30 +01:00
Dan Balasescu
3d13fe485d
Merge pull request #7238 from huoyaoyuan/fxcop 
Apply FxCop at game side
 2019-12-17 21:29:52 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
Andrei Zavatski
8cd96acffc CounterPill implementation 2019-12-17 12:05:35 +03:00
Dean Herbert
5079feaad1 Remove unnecessary string interpolation 2019-12-17 14:04:03 +09:00
Huo Yaoyuan
d7b3578cc6 CA2201: throw correct exception type. 2019-12-17 13:00:02 +08:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208) 
Update sdk and InspectCode version
 2019-12-16 19:46:12 +09:00
Dean Herbert
7d979e1264 Add finalised test scene 2019-12-16 19:41:04 +09:00
smoogipoo
6cf318c34b Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding 2019-12-16 18:41:21 +09:00
Dean Herbert
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings 2019-12-16 14:57:57 +09:00
Ganendra Afrasya
0e658790c1 Add function to assert multiplier value instead of hardcoded string 2019-12-15 22:42:44 +07:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
cea3a66d4a Use static local method fixed for roslyn 3.4 2019-12-15 20:07:56 +08:00
Dean Herbert
244eb56455 Fix test ruleset availability 2019-12-15 03:01:37 +09:00
Lucas A
43720fbf45 Fix CI issues 2019-12-13 18:59:40 +01:00
Lucas A
e05c9426ed Initial implementation of NewsArticleCover class 2019-12-13 18:50:49 +01:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
76aa4f9fb2 Fix code style issues 2019-12-13 21:36:50 +09:00
Dean Herbert
7fdaf338f3 Fix test logic and add regression test 2019-12-13 21:36:50 +09:00
Dean Herbert
f349e7ff78 Fix non-null ?? usage 2019-12-13 20:35:34 +09:00
Dean Herbert
0bbaf9b7fb Fix mod select overlay tests not running individually 2019-12-13 20:21:35 +09:00
Dean Herbert
7033974733 Fix test regressions (incorrect from the start) 2019-12-13 20:13:32 +09:00
unknown
3945e7403a improve tests and refactor AdvancedStats 2019-12-13 09:39:54 +08:00
unknown
ec5b506960 apply mod difficulty settings during song select 2019-12-12 23:41:46 +08:00
Dean Herbert
ecc7fdc561 Ensure a clean run on each test method 2019-12-12 21:04:56 +09:00
Dean Herbert
5e634c1183 Move test values to constants 2019-12-12 20:51:58 +09:00
Dean Herbert
7559012fb7 Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks 2019-12-12 19:55:09 +09:00
smoogipoo
1807fc9b61 Fix testcase not converting beatmap 2019-12-12 16:48:33 +09:00
Dean Herbert
3ccfee64f6 Add HUDOverlay tests 2019-12-12 16:09:42 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
Salman Ahmed
6a539e307a Split into small tests and add more cases 2019-12-12 09:22:35 +03:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks 2019-12-12 11:57:21 +09:00
Salman Ahmed
035a53cb9e Schedule SetUp() 2019-12-12 01:10:43 +03:00
Salman Ahmed
61265ed452 Increase the waiting steps 2019-12-12 00:52:33 +03:00
Salman Ahmed
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
Salman Ahmed
bc02cfc2e2 TestSceneUserDimContainer -> TestSceneUserDimBackgrounds 2019-12-12 00:30:16 +03:00
Lucas A
e7a06aeadc Update NewsOverlay visual tests to expose LoadAndShowChild() for testing purposes 2019-12-11 14:32:43 +01:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor 2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods 
Add per-mod settings
 2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138) 
Refactor distance snap grid to not require hitobjects
 2019-12-11 19:02:29 +09:00
Dean Herbert
274958669c Add early assert as sanity check 2019-12-11 15:47:41 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Salman Ahmed
63f66aa5fa Check by UserDimContainer.DimLevel instead 2019-12-10 15:25:03 +03:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d Refactor distance snap grid to not require hitobjects 2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
Dean Herbert
cdde5d1d69 Fix song select filters not reapplied if in a child screen 
Closes https://github.com/ppy/osu/issues/6980.
 2019-12-10 02:30:23 +09:00
smoogipoo
cd61893814 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 18:25:27 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
smoogipoo
53f7c753fb General cleanups 2019-12-09 16:44:19 +09:00
smoogipoo
c18f2e6436 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 15:34:49 +09:00
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals 2019-12-09 15:31:48 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121 Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals 2019-12-09 14:11:52 +09:00
Dean Herbert
4fbe5b7002
Merge branch 'master' into rankings-overlay-refactor 2019-12-09 11:34:32 +09:00
Dean Herbert
f65866648e Use Array.Empty 2019-12-06 20:14:56 +09:00
Dean Herbert
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
Dean Herbert
680b2653ae Improve animation of popup dialog buttons 2019-12-06 18:51:30 +09:00
Dean Herbert
cf0413663d Merge branch 'settings-source' into customized-mods 2019-12-06 18:05:39 +09:00
Dean Herbert
f84705ab96 Add tests 2019-12-06 18:04:46 +09:00
Dean Herbert
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
Dean Herbert
af35df4077 Add multiple mod testing and update test code style 2019-12-06 15:42:11 +09:00
smoogipoo
2654710d91 Add tests and fix negative expected distances 2019-12-06 15:37:06 +09:00
Dean Herbert
170954bc6e Merge remote-tracking branch 'upstream/master' into customized-mods 2019-12-06 15:31:20 +09:00
Dean Herbert
12f1c9e088 Fix test failure 2019-12-06 15:29:02 +09:00
Dean Herbert
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
smoogipoo
2702edfa55 Rename new path, replace existing one 2019-12-05 17:49:32 +09:00
smoogipoo
5e9b739b67 Re-implement slider paths to support multiple segments 2019-12-05 16:45:02 +09:00
Andrei Zavatski
bf7c309d4c Make field readonly 2019-12-05 10:05:04 +03:00
Andrei Zavatski
33737d3d89 Move tests to TestSceneRankingsOverlay due to refactoring 2019-12-05 09:53:25 +03:00
Andrei Zavatski
22863da360 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor 2019-12-05 09:29:37 +03:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Andrei Zavatski
0560a6637c Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor 2019-12-05 04:11:45 +03:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
5b8ca8f84a Remove test ignore rules 2019-12-05 01:17:11 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Dean Herbert
a225a35f91 Fix failing tests 2019-12-03 16:18:36 +09:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
Andrei Zavatski
c451542915 Rankings overlay basic implementation 2019-11-30 03:01:07 +03:00
Dean Herbert
3fc2afeb26 Fix UserDimContainer test failing on subsequent runs 2019-11-29 15:51:00 +09:00
Andrei Zavatski
36d694ad2d Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-28 20:43:17 +03:00
Andrei Zavatski
83e3ad9e69 Make Rankings a ctor variable 2019-11-28 20:09:05 +03:00
Dean Herbert
e7ef919b0b Ignore another failing test 2019-11-29 01:47:52 +09:00
Dean Herbert
1c4063677d Ignore test temporarily 2019-11-29 00:45:35 +09:00
Ganendra Afrasya
af5c5a3000 Apply reviews 
Also rename the class name to match with the others
 2019-11-28 20:06:15 +07:00
smoogipoo
f504370867 Make player block exit if pausable 2019-11-28 15:58:26 +09:00
Ganendra Afrasya
6149482b5d Add test 2019-11-28 12:03:11 +07:00
Andrei Zavatski
44cfe98278 Simplify test scene 2019-11-27 23:40:52 +03:00
Andrei Zavatski
800bda7e81 Refactor tables to avoid code duplication 2019-11-27 23:35:02 +03:00
Dean Herbert
724fcecbc5 Fix test scene not actually covering the class it's testing 2019-11-28 00:32:31 +09:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables 2019-11-27 23:26:54 +09:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods 2019-11-27 19:44:32 +09:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
77ce9642ba Add test coverage and simplify break time updating 2019-11-26 15:32:48 +09:00
Dan Balasescu
9f93727a80
Merge branch 'master' into fix-spritetext-usage 2019-11-25 12:15:05 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +09:00
Andrei Zavatski
d6c9387beb Implement NotSupporterPlaceholder 2019-11-22 21:55:21 +03:00
Dan Balasescu
5d2a608be0
Merge branch 'master' into lead-in-fixes 2019-11-22 13:48:55 +09:00
Dan Balasescu
7c19f7cd7b
Merge branch 'master' into improve-skip-button-feel 2019-11-22 13:36:27 +09:00
Dan Balasescu
ba0ac93f70
Merge branch 'master' into skip-multiple-times 2019-11-22 13:23:50 +09:00
Dean Herbert
5da5abdb05
Merge branch 'master' into prev-button-revamp 2019-11-22 02:57:22 +09:00
Andrei Zavatski
984ec11a78 Make Ruleset a bindable 2019-11-21 18:56:48 +03:00
Andrei Zavatski
458496206c Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
0d4854ac09
Add News Overlay skeleton and header (#5726) 
Add News Overlay skeleton and header

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-22 00:14:31 +09:00
Dean Herbert
1a6b5e8714
Implement TotalCommentsCounter component for CommentsContainer (#6867) 
Implement TotalCommentsCounter component for CommentsContainer
 2019-11-21 23:45:23 +09:00
Dean Herbert
ac2dfffb23 Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation 2019-11-21 22:52:45 +09:00
Dean Herbert
71a64da566 Fix test regressions 2019-11-21 22:07:37 +09:00
Dean Herbert
bd6831624a Decouple skip button animations from gameplay clock 2019-11-21 19:51:22 +09:00
Dean Herbert
46a94821d4 Add support for consecutive skips 2019-11-21 18:59:55 +09:00
Dean Herbert
8d1b11d4bd Add storyboard lead-in tests 2019-11-21 18:50:54 +09:00
Dean Herbert
4e53bca8dd Simplify tests 2019-11-21 18:50:38 +09:00
Dean Herbert
29d2374928 Add back skip button actuation count tests 2019-11-21 17:23:52 +09:00
Dean Herbert
586e31efc2 Update tests 2019-11-21 15:56:08 +09:00
Dean Herbert
8369be90f2 Allow skip button to actuate more than once 2019-11-21 15:19:06 +09:00
Dean Herbert
c0b9bb5a12 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-21 14:22:17 +09:00
Dean Herbert
be62e48296 Fix tests not working if main or audio volume is zero 2019-11-21 10:35:10 +09:00
Dean Herbert
7637e680d7 Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping 2019-11-21 10:27:32 +09:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Andrei Zavatski
509440ea14 TotalCommentsCounter implementation 2019-11-16 18:02:34 +03:00
Dean Herbert
296fff9243 Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-15 18:20:36 +09:00
Andrei Zavatski
e51fd00d58 CI fix 2019-11-15 12:09:31 +03:00
Andrei Zavatski
2592a0489b Use existing ModNoMod 2019-11-15 11:57:40 +03:00
Andrei Zavatski
b7efc276f1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-15 11:42:32 +03:00
Dean Herbert
dbfec215e7 Improve test quality 2019-11-15 14:47:28 +09:00
Dean Herbert
c7d0b88854 Update test scene 2019-11-15 14:15:09 +09:00
Dean Herbert
eee5902851 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-15 14:05:31 +09:00
Dean Herbert
b8bb97607b Merge remote-tracking branch 'upstream/master' into fix-mod-retention 2019-11-15 13:46:44 +09:00
unknown
15e85234e4 remove unecessary step 2019-11-15 11:12:51 +08:00
Dean Herbert
e81dfcad4c Fix remaining cases of pollution 2019-11-15 11:46:32 +09:00
Dean Herbert
22c3be2c6f Clear count variables on carousel creation 2019-11-15 11:26:01 +09:00
iiSaLMaN
8f02e57d1f Add test ensuring correct muting behaviour 2019-11-15 01:08:40 +03:00
iiSaLMaN
08e9813192 Add test ensuring correct changing behaviour 2019-11-14 14:23:52 +03:00
Dean Herbert
1109d201c3 Add failing test 2019-11-14 13:28:13 +09:00
Dean Herbert
2fe068174a Fix unnecessary string interpolation 2019-11-13 19:42:33 +09:00
Dean Herbert
2cd156f3d4 Clean up carousel tests 2019-11-13 19:09:03 +09:00
Dean Herbert
bca1be0bfa Add failing test 2019-11-13 18:54:33 +09:00
Dean Herbert
f11ad7535d
Merge branch 'master' into rankings-tables 2019-11-13 15:39:13 +09:00
Dean Herbert
c8e06dd1f0
Merge branch 'master' into sharpraven-deprecation 2019-11-13 15:39:10 +09:00
Dean Herbert
0292cea2c4
Merge branch 'master' into beatmap-mod-selector 2019-11-13 15:39:08 +09:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen 2019-11-13 15:38:59 +09:00
Dean Herbert
f18263aa70 Add tests 2019-11-13 12:09:18 +09:00
Dean Herbert
3c5008f94c Add test 2019-11-13 11:59:03 +09:00
Andrei Zavatski
aca3690d77 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-13 00:20:51 +03:00
Huo Yaoyuan
de732c6c24 Change code to use Sentry client. 2019-11-12 21:12:38 +08:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables 2019-11-12 18:59:43 +09:00
Dean Herbert
712a2f6918 Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks 2019-11-12 15:10:42 +09:00
Andrei Zavatski
fa01e11a6e Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-12 08:25:42 +03:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items 2019-11-12 10:31:50 +09:00
Dean Herbert
5bb65d0716 Rename button class 2019-11-12 10:21:06 +09:00
Andrei Zavatski
4145e25f7b Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-11 17:55:10 +03:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
54da8e4035 Combine similar tests 2019-11-11 19:09:38 +09:00
Dean Herbert
82cc6aa0c5 Remove unused constructor 2019-11-11 19:00:14 +09:00
Dean Herbert
bed62e0d2f Rename ThreeState -> TernaryState and add basic tests 2019-11-11 18:56:18 +09:00
Dean Herbert
ce4843be22 Move tests to parent namespace for now 2019-11-11 18:42:32 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items 2019-11-11 18:33:50 +09:00
Andrei Zavatski
93954c8da0 Use BindableList for selected mods 2019-11-10 23:58:07 +03:00
Andrei Zavatski
e3d8e29cdd Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-10 23:38:41 +03:00
iiSaLMaN
9a00898c0d Add test for non-present preview tracks 
To avoid reverting what #6738 solved
 2019-11-10 23:21:46 +03:00
Dean Herbert
45e1501c02
Merge branch 'master' into infrastructure 2019-11-09 16:23:58 +09:00
iiSaLMaN
901a8d597b Add test steps ensuring correct behaviour 2019-11-08 13:20:02 +03:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
smoogipoo
92d8526370 Adjust test namespaces 2019-11-08 13:34:27 +09:00
smoogipoo
e574aa0e94 Add toggle menu item test 2019-11-08 13:33:15 +09:00
smoogipoo
011bf09516 Add xmldocs and cleanup 2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab Reorder parameters 2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab Implement a three-state menu item 2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5 Abstract statefulness of new menu item type 2019-11-08 13:23:13 +09:00
smoogipoo
c3a3b4091b Add basic implementation of a toggleable menu item 2019-11-07 22:26:35 +09:00
Bartłomiej Dach
963215ccbe Wait for track reset in tests 
Add a wait step in tests for the "now playing" overlay to make sure
the current track was restarted before trying to call PreviousTrack()
again.
 2019-11-06 22:43:13 +01:00
Bartłomiej Dach
70feab8316
Merge branch 'master' into prev-button-revamp 2019-11-06 22:41:33 +01:00
Andrei Zavatski
59aa9b59d6 Move login to it's own function 2019-11-06 18:32:09 +03:00
Andrei Zavatski
8395df596b Don't use online API for tests 2019-11-06 18:24:30 +03:00
Andrei Zavatski
c01f3a58cb Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 18:15:49 +03:00
Dean Herbert
91bcb5d4a7 Merge remote-tracking branch 'upstream/master' into fix-network-stalls 2019-11-06 19:06:28 +09:00
Dean Herbert
31f2d6a842 Fix regressed test 2019-11-06 19:06:24 +09:00
Andrei Zavatski
0f53725005 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-06 13:03:34 +03:00
Andrei Zavatski
5589329e16 Split tests 2019-11-06 12:54:04 +03:00
Andrei Zavatski
4330507da8 Use api.IsLoggedIn 2019-11-06 12:46:25 +03:00
Andrei Zavatski
1f3b209a6c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:26:41 +03:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause (#6728) 
Fix adjustments not being removed correctly on retry from pause
 2019-11-06 17:54:20 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects (#6740) 
Limit distance snap between two adjacent hit objects
 2019-11-06 17:18:00 +09:00
Dan Balasescu
ff6bfc453b
Merge pull request #6718 from peppy/update-framework 
Update framework
 2019-11-06 16:38:15 +09:00
smoogipoo
b83ceab1c1 Add tests 2019-11-06 16:20:13 +09:00
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +09:00
Dean Herbert
a3d8738cab
Merge branch 'master' into vote-pill-fix 2019-11-06 14:52:06 +09:00
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen 2019-11-06 12:02:00 +09:00
Dean Herbert
1f40641d05 Add failing test 2019-11-06 10:32:09 +09:00
Dean Herbert
44d0791676 Update button usage 2019-11-05 16:26:31 +09:00
unknown
a92b32f6dc add basic tests 2019-11-05 00:56:09 +08:00
Bartłomiej Dach
3ec9580ba8 Add test for retry overlay presence 
Add visual tests checking presence (or lack thereof) of the
hold-to-retry overlay in the results screen.
 2019-11-04 01:55:30 +01:00
Andrei Zavatski
daefabf271 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-03 14:16:33 +03:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button 2019-11-02 10:51:14 +09:00
Andrei Zavatski
2f703090ef Update API with latest web changes 2019-11-01 21:49:50 +03:00
Andrei Zavatski
1e73cf1025 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-01 21:14:09 +03:00
Dean Herbert
84d17f3702 Add retry button 2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3 Move ReplayDownloadButton to correct namespace 2019-11-01 15:06:36 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert
fe93df7186 Remove unnecessary using statement 2019-10-31 16:52:56 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
Andrei Zavatski
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
Huo Yaoyuan
8d290a3242 Resolve CS0067. 2019-10-30 23:43:13 +08:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Andrei Zavatski
759395bcb5 CI fix 2019-10-30 04:31:09 +03:00
Andrei Zavatski
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
Andrei Zavatski
7f755fe726 Add more tests 2019-10-30 03:47:17 +03:00
Andrei Zavatski
f1a2643c40 Add test scene 2019-10-30 03:45:05 +03:00
Dean Herbert
04b0916196
Merge branch 'master' into fix-day-separator-purging 2019-10-29 18:44:39 +09:00
Dean Herbert
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
Dean Herbert
3de45eb04a
Fix loader animation tests failing occasionally (#6655) 
Fix loader animation tests failing occasionally
 2019-10-29 18:18:17 +09:00
Dean Herbert
342dfc26d2 Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom 2019-10-29 18:17:38 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default (#6641) 
Fix PlayerSettingsOverlay being shown by default
 2019-10-29 18:16:33 +09:00
Dean Herbert
8e1faf6ff1 Fix loader animation tests failing occasionally 2019-10-29 17:03:52 +09:00
Dan Balasescu
f0f58c22d3
Merge branch 'master' into labelled-component-bindables 2019-10-29 16:32:57 +09:00
Dean Herbert
b06e70e546 Add failing test showing issue with day separator logic 2019-10-29 15:27:08 +09:00
Dean Herbert
d1c6e3f620 Add test for scroll to end when max history is exceeded 2019-10-29 14:32:52 +09:00
Dean Herbert
ecf14bc7b9 Rename class to match 2019-10-29 01:21:17 +09:00
Dean Herbert
46b44f4f99 Fix PlayerSettingsOverlay being shown by default 2019-10-28 18:37:58 +09:00
Dean Herbert
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
Dean Herbert
1953aa64b6 Merge branch 'bindable-control-points' into editor-timing-screen 2019-10-28 12:00:51 +09:00
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Bartłomiej Dach
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
Dean Herbert
0fba272e78 Add the ability to add new ControlPoint types to existing groups 2019-10-27 15:19:36 +09:00
nwabear
349a2745c5 Merge remote-tracking branch 'origin/master' 2019-10-26 14:30:17 -05:00
nwabear
9e2e87c8d1 added visual tests 
added small commenting
added xmldoc for CancelResume();
 2019-10-26 14:29:52 -05:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Dean Herbert
94ffe03e6e Group timing points 2019-10-25 19:36:12 +09:00
smoogipoo
a9ec6b2562 Fix testcase failure 2019-10-25 19:00:10 +09:00
smoogipoo
ae011e8ee8 Fix distance snap grid test scenes 2019-10-25 17:25:46 +09:00
smoogipoo
607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
smoogipoo
d83b9ef0e4 Rename grid snapping methods 2019-10-24 18:18:04 +09:00
Dean Herbert
7f64012cfc Remove seek 2019-10-24 14:35:45 +09:00
Dean Herbert
f32b84d07d Fix tests not working on CI (where no beatmaps were present) 2019-10-24 14:05:56 +09:00
Dean Herbert
42e33dde0c Make tests actually test 2019-10-24 13:18:31 +09:00
Dean Herbert
967551fec0 Renames and xmldoc 2019-10-24 13:10:17 +09:00
Ganendra Afrasya
224a887773 Merge remote-tracking branch 'origin/master' into prev-button-revamp 2019-10-24 07:44:18 +07:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
Dean Herbert
6866d27634 Merge remote-tracking branch 'upstream/master' into editor-timing-screen 2019-10-23 11:18:42 +09:00
Andrei Zavatski
a3ab6d33c1 Add test 2019-10-22 01:37:30 +03:00
Dean Herbert
0fbba9a5e5 Split out more classes 2019-10-20 23:42:13 +09:00
Dean Herbert
7dc65ec964 Add missing required types 2019-10-20 23:32:49 +09:00
Salman Ahmed
eed6f708a2
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-19 04:06:43 +03:00
Andrei Zavatski
266f9a065f Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill 2019-10-18 19:25:05 +03:00
Dean Herbert
f22ec6f5bd Merge branch 'master' into editor-timing-screen 2019-10-18 16:57:46 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid 
Implement osu!'s beat snapping grid
 2019-10-18 16:27:03 +09:00
Andrei Zavatski
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
Dean Herbert
f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +09:00
Dean Herbert
3a6a25ffe8
Merge branch 'master' into non-static-rulesetstore 2019-10-17 14:25:06 +09:00
Ganendra Afrasya
736a36a326 Fix failed testcase 2019-10-16 14:30:09 +07:00
smoogipoo
12cd57744b Make RulestStore initialise at construction time 2019-10-15 16:14:06 +09:00
Andrei Zavatski
42a06a54ff Don't use ProfileShowMoreButton in the test scene to avoid confusion 2019-10-15 01:08:23 +03:00
Andrei Zavatski
09621f066e Childs -> Children 2019-10-15 00:32:21 +03:00
Andrei Zavatski
7cd3f5656d Cleanups 2019-10-14 16:43:43 +03:00
Andrei Zavatski
7ac87494e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-14 16:21:34 +03:00
Dean Herbert
89f270a19a SortSelector -> SortTabControl 2019-10-14 21:32:41 +09:00
Dean Herbert
ae1a361f9f
Merge branch 'master' into commenst_header 2019-10-14 21:20:05 +09:00
Andrei Zavatski
2f209d1dfa Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 14:53:41 +03:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Andrei Zavatski
27e3ffd293 Update dependencies 2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 11:15:43 +03:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2 2019-10-12 23:28:51 +09:00
Andrei Zavatski
7ffe5ac539 Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header 2019-10-12 15:02:12 +03:00
smoogipoo
631f155554 Add grid to make the test not appear empty 2019-10-11 18:24:33 +09:00
smoogipoo
050d86a741 Always use the local coordinate space 2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2 Rename grid creation method + parameter 2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7 Rename startPosition to centrePosition 2019-10-11 18:24:33 +09:00
smoogipoo
824595427d Remove extra whitespace 2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39 Implement base class for beat snapping grids 2019-10-11 18:24:33 +09:00
Dean Herbert
937dbb7bf6 Initial layout for timing screen 2019-10-11 16:22:24 +09:00
Ganendra Afrasya
b07c477aad Add test case on TestSceneNowPlayingOverlay 2019-10-11 01:24:03 +07:00
Dean Herbert
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio 2019-10-10 22:08:20 +09:00
Andrei Zavatski
b45e7246b8 Rename SortCommentsBy to CommentsSortCriteria 2019-10-10 15:56:08 +03:00
Dean Herbert
5eba33e876 Simplify logic and add test coverage for remaining case 2019-10-10 20:12:47 +09:00
Andrei Zavatski
64f62bd2bf Implement CommentsHeader component 2019-10-10 12:06:25 +03:00
Dean Herbert
8df2e359c4 Fix tests on CI 2019-10-10 17:42:15 +09:00
Andrei Zavatski
371b7841d0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-10 11:27:44 +03:00
Dean Herbert
f74c79c2b8 Fix audio playback position being reset after resuming to song select 2019-10-10 11:58:43 +09:00
Andrei Zavatski
107d39c3e9 Add DeletedChildsPlaceholder to the bottom of the comments container 2019-10-09 14:10:05 +03:00
Andrei Zavatski
7e3c97f496 Implement DeletedChildsPlaceholder component 2019-10-09 13:37:07 +03:00
Andrei Zavatski
0a56b041fd Implement ShowChildsButton 2019-10-09 11:07:56 +03:00
Dean Herbert
f2adae8fd1 Rename test case to better match underlying class 2019-10-09 16:05:38 +09:00
Andrei Zavatski
6deafc04bf Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-09 10:00:20 +03:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
Dan Balasescu
e8276dc562
Merge branch 'master' into fix-ignored-test 2019-10-09 11:39:40 +09:00
Andrei Zavatski
29b0eacc82 Implement SortSelector component 2019-10-08 22:46:42 +03:00
Andrei Zavatski
574170124c Implement HeaderButton component 2019-10-08 21:38:19 +03:00
Andrei Zavatski
b9ad079bf8 Move CommentsHeader to it's own file 2019-10-08 20:57:55 +03:00
Andrei Zavatski
1c89841949 Move all the logic to it's own namespace 2019-10-08 14:51:12 +03:00
Andrei Zavatski
275648ee4f Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-08 13:31:52 +03:00
Dean Herbert
4446a2972c Move WaveContainer test out of editor namespace 2019-10-08 18:08:05 +09:00
Dean Herbert
8ebccfe31f Add comprehensive audio state tests 2019-10-08 17:03:13 +09:00
Dean Herbert
f284d096b7 Fix ignored song select test 2019-10-08 16:37:47 +09:00
Andrei Zavatski
aa8df0fa20 Hook up api and implement some visual comments representation 2019-10-07 18:26:07 +03:00
Andrei Zavatski
e772822bd5 Basic implementation 2019-10-07 17:49:20 +03:00
Dean Herbert
46d6c5ec3b Add failing test 2019-10-07 15:17:03 +09:00
Dean Herbert
62c4c1266e Move private functions to bottom 2019-10-07 15:17:03 +09:00
Joehu
de658c932e Fix test regression 2019-10-04 17:22:42 -07:00
iiSaLMaN
4f40a04425 Add tests ensuring correct behaviour with ruleset selection 2019-10-04 17:57:39 +03:00
iiSaLMaN
edddbdb784 Add tests for beatmap ruleset selector 2019-10-04 17:37:09 +03:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay (#6369) 
Fix Alt-F4 being blocked during gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:33:00 +08:00
Dean Herbert
f1772d01d2
Add the new switch button + labelled switch button (#6257) 
Add the new switch button + labelled switch button

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:01:57 +08:00
Dean Herbert
626f7388c8 Add tests for quick retry and quick exit scenarios 2019-10-04 12:23:01 +08:00
Dean Herbert
e646b2677c Add test coverage 2019-10-04 11:25:23 +08:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button 2019-10-04 11:15:54 +08:00
smoogipoo
a5e1cb8feb Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge 2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-03 08:43:31 -07:00
Craftplacer
dbcb9e51c2
Merge branch 'master' into muted-notification 2019-10-03 12:51:22 +02:00
Dean Herbert
e9c73ce30f Fix random failures on BeatmapCarousel filter test 
The "un-filter" step causes a `SelectNextRandom` invocation. If this happens to select a difficulty in set 3 other than the previously buffered difficulty #2, the subsequent test would fail.

I've split this test out to remove the random element, but added a new assert to ensure buffered (previously visited?) difficulty is re-selected on return to the same set.
 2019-10-03 16:21:14 +08:00
Joehu
ff56453f1a Fix test regressions 2019-10-02 12:07:07 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification 2019-10-02 17:31:34 +02:00
Andrei Zavatski
5274f69872 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-10-02 13:00:29 +03:00
Craftplacer
5f399add82 Resolve @iiSaLMaN 's suggested changes 2019-10-01 18:15:40 +02:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification 2019-10-01 17:26:11 +02:00
Ganendra Afrasya
208b9a4eba Add new virtual float for username to timestamp padding 2019-10-01 20:47:53 +07:00
Andrei Zavatski
ff477cd56c Remove humanized number dependency 2019-10-01 14:12:03 +03:00
Andrei Zavatski
5b09daef1a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-10-01 13:54:15 +03:00
Andrei Zavatski
f24ac04beb Add suggested blank line for consistency 2019-09-29 15:18:29 +03:00
Andrei Zavatski
883ee9851a Update dependencies 2019-09-29 15:02:33 +03:00
Andrei Zavatski
5314f76fda Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-09-29 14:58:58 +03:00
Andrei Zavatski
97a0e0097f Add testing 2019-09-29 14:56:33 +03:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00
Dean Herbert
539f3329ce Rename method to match new behaviour 2019-09-29 12:23:18 +08:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
Bartłomiej Dach
2487d4f0f2 Migrate beatmap carousel test to AddUntilStep 
Due to non-deterministic test failures in TestSceneBeatmapCarousel,
migrate the checkSelected helper step from AddAssert to AddUntilStep.
This adds more leniency for performance-related issues while still
checking the desired behaviour.
 2019-09-28 11:58:27 +02:00
Andrei Zavatski
bbaf21a69d Tables implementation 2019-09-27 19:33:52 +03:00
Andrei Zavatski
2a395956aa Merge dependencies 2019-09-27 19:00:17 +03:00
Craftplacer
06c32d52dc Change wrong volume bindable used in test 2019-09-27 09:19:39 +02:00
Craftplacer
9a31ccd2e3 Add missing test cases for master, track and mute button 
This also modifies the reset player method to make it possible to set something before the player is loaded but after the container has loaded.
 2019-09-26 14:05:43 +02:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… (#6236) 
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-25 22:34:46 +09:00
Dean Herbert
8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
smoogipoo
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
smoogipoo
ccb5623487 Fix test name 2019-09-25 20:03:03 +09:00
Dean Herbert
f11156c2dc Fix tests not working correctly 2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e Add a labelled switch button 2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
Dean Herbert
8fd1a45a42 Change intro displayed for tests 
As the triangles intro relies on the audio track's clock advancing, we can't use it just yet (CI server has no audio device). This is a temporary workaround for that shortcoming.
 2019-09-25 15:29:02 +09:00
Dean Herbert
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
Dean Herbert
2089f6fc42 Fix potential test fail case 2019-09-25 14:28:35 +09:00
Joehu
102dbd85bd Fix CI errors 2019-09-24 16:48:22 -07:00
Joehu
cc6030ca14 Update beatmap info wedge tests 2019-09-24 16:23:36 -07:00
Joehu
8efba255c3 Add truncation test 2019-09-24 16:21:08 -07:00
Dean Herbert
4a59e3351e Update beatmap carousel tests code style 
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
 2019-09-25 02:42:12 +09:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed 2019-09-24 22:20:19 +09:00
Dean Herbert
f493f1c71d Move new components to v2 namespace 2019-09-24 19:00:26 +09:00
smoogipoo
028c958431 Initial implementation of a switch button 2019-09-24 18:39:11 +09:00
smoogipoo
6b702eb6de Update with generic labelledcomponent 2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654 Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements 2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c Make LabelledComponent generic 2019-09-24 18:22:02 +09:00
smoogipoo
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
Dean Herbert
9a6d748498
Merge branch 'master' into add-creator-artist-filters 2019-09-23 12:31:51 +09:00
Dean Herbert
d6ec6b1eda
Merge branch 'master' into labelled-textbox-improvements 2019-09-23 00:39:29 +09:00
Dean Herbert
9fe7675be8
Add a base class for all future labelled components (#6187) 
Add a base class for all future labelled components
 2019-09-23 00:38:51 +09:00
Bartłomiej Dach
51509f6be0 Add filter steps to carousel visual test 
Just a couple of steps for added coverage in visual tests. Very
on-the-surface, the unit tests are supposed to cover the gory details.
 2019-09-22 00:20:54 +02:00
Lucas A
bbf3ac77f8 Add visual test for HTML string unescaping. 2019-09-20 21:35:26 +02:00
smoogipoo
2bbf4ca4b5 Update LabelledTextBox to use LabelledComponent 2019-09-20 18:50:50 +09:00
smoogipoo
e0a97cfac5 Add a LabelledComponent base class 2019-09-20 18:35:15 +09:00
Andrei Zavatski
0cf4db899f Few cleanups 2019-09-19 17:03:52 +03:00
Andrei Zavatski
efea8be97d Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-19 17:03:00 +03:00
Andrei Zavatski
529a1c3b91 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-19 16:46:58 +03:00
Dean Herbert
4e9bb7b121 Merge remote-tracking branch 'upstream/master' into hold-to-press-setting 2019-09-19 22:35:18 +09:00
Dean Herbert
23c5cb6367 Expand tests to cover new behaviour 2019-09-19 22:35:14 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score 
Show personal best on song select
 2019-09-19 21:17:23 +09:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00
Dean Herbert
2b6c9aeb26 Move top score container to more local namespace 2019-09-19 15:38:40 +09:00
Dean Herbert
9b35de9ce1 Update tests 2019-09-19 15:23:37 +09:00
Dean Herbert
a7b6895d4c Revert changes to BeatmapDetailArea 2019-09-19 14:26:15 +09:00
iiSaLMaN
e793854735 Invert BypassFail usage 2019-09-19 08:00:41 +03:00
Dean Herbert
e5509cd390 Rename test 2019-09-19 13:19:48 +09:00
Dean Herbert
2e0a85c2f6 Merge remote-tracking branch 'upstream/master' into songselect-best-user-score 2019-09-19 12:57:30 +09:00
iiSaLMaN
3efcf0493c Remove redundant using directive 2019-09-18 23:28:48 +03:00
iiSaLMaN
ea6318ed73 Fix failing test 2019-09-18 23:17:24 +03:00
iiSaLMaN
871adb16e0 Add asserts for fail bypassing 2019-09-18 22:51:03 +03:00
Dean Herbert
e17cd9e964 Reduce length of tests 2019-09-18 16:14:31 +09:00
Dean Herbert
77947e8309 Fix rewind tests failing 2019-09-17 22:33:27 +09:00
Dean Herbert
38d85e44be Merge branch 'master' into key-counter-fixes 2019-09-17 22:33:15 +09:00
Dean Herbert
9d8eb42ac7
Merge branch 'master' into news-overlay-header 2019-09-16 00:59:18 +09:00
Andrei Zavatski
babd34470e Fix DrawableFlag returns empty texture if there's no flag avaliable for needed country 2019-09-15 02:33:21 +03:00
Dean Herbert
9e53c091a3
Merge pull request #6095 from peppy/fix-test-dummy-api 
Fix incorrect DI usage of IAPIProvider in many tests
 2019-09-13 22:22:07 +09:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes 2019-09-13 19:43:33 +09:00
Dean Herbert
a7c59098ce Fix missing assignment 2019-09-13 17:38:04 +09:00
Dean Herbert
7cb79dd760 Fix incorrect DI usage of IAPIProvider in many tests 2019-09-13 17:15:33 +09:00
Andrei Zavatski
9a9654dbd1 Fix the Test Scene 2019-09-13 10:59:09 +03:00
Andrei Zavatski
c9ae4336f9 Fix RankingsScope test 2019-09-13 10:50:26 +03:00
Andrei Zavatski
51f17ccb1b Remove test duplicate 2019-09-13 10:48:02 +03:00
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
ffd205f470 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076 2019-09-13 16:25:30 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart 
Fix player not correctly restarting after an unpause
 2019-09-13 16:09:41 +09:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d Fix player not correctly exiting after an unpause 2019-09-13 15:42:58 +09:00
Dean Herbert
44947aa9ed Make PopupDialog abstract 2019-09-13 15:27:29 +09:00
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
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