h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 21:12:55 +08:00
Code Issues Releases Wiki Activity
54,485 Commits 6 Branches 666 Tags 358 MiB
91742859f1
Commit Graph

908 Commits

Author SHA1 Message Date
dependabot-preview[bot]
6a286c5e21
Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-01 17:16:02 +00:00
Naxess
b8479a979f Remove unused blueprint variable 2021-04-01 18:06:12 +02:00
Naxess
7e47922fb7
Merge branch 'master' into circular-arc-freeze 2021-04-01 17:09:45 +02:00
Naxess
25afae5671 Fix broken test case 
Seems this technically works, but only because of the edge case of being entirely linear, which the framework catches.

This fixes that.
 2021-03-31 20:48:17 +02:00
Naxess
1718084dbc Update/remove determinant tests 
We now only change the path type based on the bounding box.

If the control points are too linear, the framework now handles the fallback to Bezier.
 2021-03-31 20:08:39 +02:00
Salman Ahmed
0bf84e473d Refactor spinner SPM counter for skinning purposes 2021-03-30 04:19:23 +03:00
Salman Ahmed
f49481e308 Add old skin spinner SPM background for testing 2021-03-29 09:32:44 +03:00
smoogipoo
1c1af98144 Update values 2021-03-26 11:47:41 +09:00
smoogipoo
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09:00
Dean Herbert
c715b9b89e Merge branch 'master' into legacy-spinner-bonus 2021-03-25 18:09:25 +09:00
Naxess
0f4314c1d8 Add complete arc test 
Ensures we can still make smaller circles properly.
 2021-03-24 17:24:33 +01:00
Naxess
b4dc35f66b Update large arc tests 
Should now be more robust and readable.
 2021-03-24 17:24:05 +01:00
Naxess
415797aadd Fix broken control point drag test 
Broken for 2 reasons:
- Assert checks the wrong control point.
- The exterior arc is now too big.

This fixes both.
 2021-03-24 06:01:12 +01:00
Naxess
f80b3ada25 Add circular arc size tests 2021-03-24 05:54:48 +01:00
Naxess
7b395ed783 Add exterior arc test 2021-03-24 05:15:50 +01:00
Naxess
23a4d1c135 Shorten recovery test name 2021-03-24 05:15:28 +01:00
Naxess
6fbe530016 Fix coordinates 2021-03-24 05:14:35 +01:00
Naxess
847d44c7d9 Remove unnecessary length asserts 
We don't actually care about the length (as this isn't what we're testing), just the type of the slider.
 2021-03-24 05:13:37 +01:00
Naxess
7bae4ff43d Add control point dragging tests 2021-03-24 05:06:04 +01:00
Dean Herbert
08fcdc8ee4 Update difficulty calculator tests with floating point differences 2021-03-23 15:38:01 +09:00
Naxess
323b875cea Fix newlines/spaces 2021-03-22 17:32:40 +01:00
Naxess
15af57de95 Add path type recovery test 2021-03-22 15:59:59 +01:00
Naxess
3bddc4a75d Add path type test 2021-03-22 15:59:45 +01:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2 
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
 2021-03-21 11:05:15 +01:00
Naxess
a294f328fb Add linear circular arc test 2021-03-21 06:30:17 +01:00
Bartłomiej Dach
aec859b4d1 Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-18 19:51:46 +01:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
1573298e68 Update remaining package references to point to efcore5 2021-03-15 13:12:10 +09:00
Salman Ahmed
c4048c9831 Merge branch 'master' into legacy-spinner-bonus 2021-03-13 05:54:34 +03:00
Salman Ahmed
97f56340af Add legacy score font to testing old skin 2021-03-06 20:27:56 +03:00
dependabot-preview[bot]
b03efd6940
Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-02 00:43:45 +00:00
smoogipoo
ee6a94273d Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-02-22 18:31:27 +09:00
Samuel Cattini-Schultz
417bb07b36 Update tests with fixed diffcalc values 2021-02-20 20:23:49 +11:00
Samuel Cattini-Schultz
9d229a5ec2 Add tests for clockrate adjusted difficulty calculations 2021-02-20 16:27:58 +11:00
Dean Herbert
00574a5288 Use ISample everywhere in Skin GetSample lookup path 2021-02-18 18:32:28 +09:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dean Herbert
aaa0362b12 Merge branch 'master' into autoplay-rate-independence 2021-02-11 17:39:45 +09:00
smoogipoo
321ca43b61 Update test 2021-02-10 20:28:00 +09:00
Dean Herbert
1cb51fa8d2
Merge branch 'master' into autoplay-rate-independence 2021-02-09 16:05:34 +09:00
Bartłomiej Dach
0df15b4d7a Add test coverage 2021-02-07 19:25:33 +01:00
Bartłomiej Dach
3fabe247b0 Allow OsuModGenerator to accept a mod list 2021-02-07 18:35:34 +01:00
Bartłomiej Dach
68c20a2a37 Allow autoplay score generation to access mod list 2021-02-07 18:35:34 +01:00
smoogipoo
6aece18f8d Add OOHP tests 2021-02-05 15:36:47 +09:00
smoogipoo
64a2c7825e Fix incorrect assert 2021-02-05 15:26:12 +09:00
smoogipoo
c9481ebbaf Rename test scene 2021-02-05 15:25:26 +09:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Dean Herbert
1e99357a97 Update build configurations to net5.0 paths 2021-01-19 12:13:27 +09:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Bartłomiej Dach
c80e9c08fd
Merge branch 'master' into net5.0 2021-01-16 16:07:44 +01:00
Mysfit
a3535f4b79 Further simplified beatmap colouring tests. 2021-01-16 02:09:35 -05:00
Mysfit
112967c1e8 Created base class for testing beatmap colours. 2021-01-15 23:46:46 -05:00
Dean Herbert
6adb6b6700 Fix spinner tests not playing spinning sound due to empty hitsamples 2021-01-15 17:13:52 +09:00
Dean Herbert
88a27124c0 Make long spinner test longer and fix step name 2021-01-15 17:13:27 +09:00
Roman Kapustin
0ea4e221b2 Merge branch 'master' into net5.0 2021-01-14 14:02:51 +03:00
Mysfit
8b95817f7a Moved SkinProvidingContainer bindable fetching to common method. Replaced redundant test boolean declarations with inline values. 2021-01-13 16:05:46 -05:00
Mysfit
80bcd78a48 Removed unnecessary using. 2021-01-13 02:04:59 -05:00
Mysfit
5f10bcce02 Added beatmap colour settings checkbox and associated tests. 2021-01-13 00:09:22 -05:00
Bartłomiej Dach
9984c80c87 Make useless existing test actually fail 2021-01-06 22:08:37 +01:00
dependabot-preview[bot]
0fd2e368c1
Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-01 17:53:41 +00:00
Dean Herbert
3c8f871b28 Move player constructor configuration to dedicated class; add AllowRestart parameter 2020-12-23 17:47:46 +09:00
Dean Herbert
53da137425
Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
ekrctb
245be2c5ed Adjust namespace 2020-12-04 20:21:53 +09:00
Bartłomiej Dach
0bc591fef2 Add failing assertions 
`GameplayBeatmap` has to be used instead of the normal bindable
`Beatmap`, beecause the former uses osu!-specific hitobjects, while
the latter returns convert objects (i.e. `ConvertSlider`s).

Similarly, the mod has to be fetched from the player instead of the
global bindable, as `Player` has its own cloned instance of the mod, to
which the beatmap is applied. The global bindable instance does not have
`FirstObject` set.
 2020-12-03 22:51:59 +01:00
smoogipoo
db7e82c560 Add test 2020-12-03 14:54:28 +09:00
Dean Herbert
71a121389b
Merge pull request #11033 from smoogipoo/immutable-hit-samples 
Make HitSampleInfo immutable
 2020-12-02 14:44:26 +09:00
smoogipoo
3422e046da Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.NET.Test.Sdk-16.8.0' into update-dependencies 2020-12-02 10:37:21 +09:00
dependabot-preview[bot]
5772a0811c
Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 00:56:09 +00:00
Bartłomiej Dach
03f5460dd2 Mark OsuModTestScene as abstract 2020-12-01 21:57:16 +01:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
Dean Herbert
203c36f720 Rename file to match test name 2020-11-26 19:46:54 +09:00
Dean Herbert
9a08cc8c04 Add test coverage of beat snapping hit circles 2020-11-26 19:40:10 +09:00
Dean Herbert
ab1ad99c88 Fix failing test scene (was previously not snapped properly) 2020-11-26 19:33:51 +09:00
Dean Herbert
740b9fb3a0 Update test to cover non-ordered selection 2020-11-25 17:33:21 +09:00
Dean Herbert
4eef6c0d40 Add test coverage 2020-11-24 17:59:18 +09:00
Dean Herbert
09f2a85d71 Fix potential test failure due to precision check missing 2020-11-24 17:40:00 +09:00
Dean Herbert
c9a41f9dae Make all objects in selection candidates for spatial snapping 
Closes #10898.
 2020-11-24 17:35:54 +09:00
Dan Balasescu
721005e306
Merge pull request #10921 from peppy/hitcircle-test-scene-shows-judgements 
Refactor TestSceneHitCircle to show judgements
 2020-11-20 22:08:27 +09:00
Dan Balasescu
4213d6bdba
Merge pull request #10890 from peppy/legacy-jugement-match-stable-transforms 
Adjust judgement animations to match stable
 2020-11-20 21:47:21 +09:00
Dean Herbert
a26b0915b4 Fix scheduled tasks not being cleaned up between test steps 2020-11-20 20:08:05 +09:00
smoogipoo
7bd75eca81 Separate classes 2020-11-20 16:53:08 +09:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
Dean Herbert
d4054c87d3 Refactor TestSceneHitCircle to show judgements 2020-11-20 16:24:17 +09:00
smoogipoo
2ed2ddfe8a Rename methods 2020-11-20 15:39:29 +09:00
smoogipoo
c53a8fafe6 Make test fail as expected 2020-11-20 14:25:07 +09:00
smoogipoo
a3145ed96d Fix test compile errors 2020-11-20 13:54:41 +09:00
smoogipoo
d467a00eea Add initial followpoint pooling implementation 2020-11-20 00:11:31 +09:00
Dean Herbert
3024ae6d86 Add better test coverage of hit lighting (and ensure reset after animation reapplication) 2020-11-19 14:10:07 +09:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms 2020-11-18 20:33:58 +01:00
Dean Herbert
8522ddc61e Reduce nesting of skinned component to reduce exposed surface 2020-11-18 19:34:27 +09:00
Dean Herbert
1fd582d333 Update lighting tests to not require lighting (some test skins are missing it) 2020-11-18 19:12:29 +09:00
Dean Herbert
25d4511e49 Fix judgement test scene always using hitobjects at t=0 2020-11-18 19:03:34 +09:00
smoogipoo
4cf6aca873 Fix slider ball tint not working 2020-11-16 22:40:25 +09:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Dan Balasescu
09298139e1
Merge pull request #10844 from bdach/spinner-rotation-tracker-state 
Fix rotation tracker state not being reset on drawable spinner re-use
 2020-11-16 17:10:40 +09:00
Bartłomiej Dach
9f27d4a9f4 Cover mapping fully for osu! mods 2020-11-15 15:32:02 +01:00
Bartłomiej Dach
9899687bfe Rename existing method to allow for new one 2020-11-15 14:17:41 +01:00
Bartłomiej Dach
af392e3995 Move rate adjusted spinner rotation into judgement result 2020-11-14 21:10:12 +01:00
Bartłomiej Dach
5ae3d6cc74 Add failing asserts 2020-11-14 21:02:44 +01:00
smoogipoo
9792d1fc73 Fix slider tests 2020-11-13 23:08:39 +09:00
Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base 2020-11-12 23:17:36 +09:00
smoogipoo
de31c1ea0c Fix skinfallback test crashing on repeats 2020-11-12 17:58:39 +09:00
smoogipoo
6f7a1dd57d Merge branch 'master' into hitobject-pooling-base 2020-11-11 17:09:18 +09:00
Dean Herbert
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply 2020-11-11 10:54:24 +09:00
smoogipoo
6f3f6dc28b Add hitobject lifetime support 2020-11-10 20:16:52 +09:00
Dean Herbert
b1367acf74
Merge pull request #10722 from nbvdkamp/fix-vscode-build-tasks-for-git-bash 2020-11-10 14:37:00 +09:00
Joehu
ef3c918a3c Simplify input buttons/keys in tests 2020-11-09 14:18:20 -08:00
kamp
ceb17764b1 Also replace / with - for args in other task.jsons 2020-11-07 01:09:21 +01:00
smoogipoo
4a07a7e757 Refactor test 2020-11-07 00:40:41 +09:00
smoogipoo
1c8d68676e Add tests 2020-11-07 00:00:25 +09:00
Dean Herbert
7d33dc3dea Reorder spinner tests to promote hit being the first to display 2020-11-05 17:27:41 +09:00
Dean Herbert
a43166e8a9
Merge branch 'master' into followpointrenderer-hitobject 2020-11-05 15:42:09 +09:00
smoogipoo
9c1c9945af Make FollowPointRenderer use hitobject models 2020-11-05 15:01:45 +09:00
smoogipoo
9a7fcadabc Use BDL for top-level osu! DHOs 2020-11-05 13:51:46 +09:00
Dean Herbert
f9ca47ca86 Add test coverage 2020-10-20 13:59:07 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments 2020-10-04 21:38:40 +09:00
Dean Herbert
ec30ca24c5
Merge pull request #10343 from bdach/hitresult-miss-fixes 
Replace direct references to HitResult.Miss wherever applicable
 2020-10-04 21:36:26 +09:00
Bartłomiej Dach
7e7f225eee Adjust slider input test to match new judgement result 2020-10-03 12:34:34 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Dean Herbert
f0eae02471 Merge branch 'fix-broken-ctor-tests' into skin-slider-end-circle-support 2020-10-02 18:24:35 +09:00
Dean Herbert
1a0171fb2d Fix tests specifying steps in their constructors 2020-10-02 18:23:18 +09:00
Dean Herbert
78bf58f4f8 Add metrics skin elements for sliderendcircle 2020-10-02 14:50:03 +09:00
Dean Herbert
50722cc754 Update slider test scene sliders to fit better 2020-10-02 14:48:56 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
6b416c9881 Rename method and improve method implementation 2020-10-01 12:09:12 +09:00
smoogipoo
4c872094c9 Adjust slider tests 2020-09-29 18:29:50 +09:00
smoogipoo
bad48d6d44 Merge branch 'master' into scoring-standardisation 2020-09-29 16:33:38 +09:00
smoogipoo
a77741927c Use new hit results in osu 2020-09-29 16:33:38 +09:00
Dean Herbert
b2261f03e2
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 20:21:35 +09:00
Dean Herbert
c41fb67e73 Move all ruleset editor tests to their own namespace 2020-09-25 18:51:26 +09:00
Dean Herbert
8a0c79466d Use simplified methods for press/release key 2020-09-25 12:16:50 +09:00
Dean Herbert
15b1069099 Fix tests not being relative to screen space 2020-09-24 16:37:08 +09:00
Dean Herbert
ead6479442 Also test with distance snap enabled for sanity 2020-09-24 16:31:30 +09:00
Dean Herbert
89ded2903c Add test coverage of circle-slider snapping 2020-09-24 16:24:35 +09:00
Dean Herbert
1a98e8d715 Add test coverage of object-object snapping 2020-09-24 16:24:35 +09:00
Dean Herbert
0cecb2bba3 Remove incorrect assumption from tests 2020-09-21 19:33:19 +09:00
smoogipoo
679dc34aa4 Add test timeouts 2020-09-07 17:18:54 +09:00
Dean Herbert
249ae5df1b
Merge branch 'master' into beatmap-track-rework 2020-09-02 15:24:46 +09:00
dependabot-preview[bot]
66c0d12da6
Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.0 to 16.7.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-01 17:19:46 +00:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework 2020-09-01 16:06:38 +09:00
Craftplacer
9b3a48ee5e
Revert "Add marker interface for beatmap skins" 2020-08-31 18:29:46 +02:00
Dean Herbert
814655770d
Merge branch 'master' into beatmapskin-interface 2020-08-30 12:22:55 +09:00
Bartłomiej Dach
c9723e541a Add metrics skin resources for old style spinner 2020-08-29 23:21:19 +02:00
Bartłomiej Dach
d22768a98c Add scale specification to spinner scene for visibility 2020-08-29 23:20:59 +02:00
Craftplacer
43e91877a7 Scope and limit parameter to IBeatmapSkin 2020-08-29 14:47:26 +02:00
Craftplacer
9ce9ba3a0d Update TestSceneSkinFallbacks.cs 2020-08-29 13:50:29 +02:00
Craftplacer
4cb9e1d443 Initial commit 2020-08-29 10:33:43 +02:00
Dean Herbert
fcf7038642 Fix a couple of missed cases 2020-08-27 00:21:50 +09:00
Dean Herbert
d2c2e8bbe8 Revert some more usage of MusicController back to WorkingBeatmap 2020-08-21 15:17:21 +09:00
Dean Herbert
9e7a28002d Merge branch 'master' into beatmap-track-rework 2020-08-13 17:56:50 +09:00
smoogipoo
45876bc55a Fix reference to non-existent variable 2020-08-12 23:50:33 +09:00
Dean Herbert
429ad783cf Merge branch 'update-framework' into beatmap-track-rework 2020-08-12 23:35:46 +09:00
Bartłomiej Dach
25f59e0489 Add failing test cases 2020-08-11 21:55:50 +02:00
Bartłomiej Dach
b78ccf8a34 Rewrite Spun Out test scene 2020-08-11 21:28:00 +02:00
Dean Herbert
ca7fd57ec2
Merge pull request #9826 from bdach/spinner-rotation-clock-rate 2020-08-11 10:43:55 +09:00
Bartłomiej Dach
cca78235d5 Replace CumulativeRotation with RateAdjustedRotation 2020-08-10 23:02:06 +02:00
Bartłomiej Dach
5d63b5f6a5 Add failing test cases 2020-08-10 23:02:01 +02:00
Bartłomiej Dach
61f1c4fe62 Extract replay-transforming helper test method 2020-08-10 19:51:00 +02:00
dependabot-preview[bot]
d7de8b2916
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-10 17:17:07 +00:00
smoogipoo
5002d69f69 Update inspections 2020-08-07 20:51:56 +09:00
smoogipoo
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Dean Herbert
3b15a50f0d Fix unnecessary + character 2020-08-06 12:34:42 +09:00
Dean Herbert
d5324be07d Fix malformed testcase 2020-08-06 12:33:40 +09:00
Dean Herbert
bb73489ae5 Fix very short spinners being impossible to complete 2020-08-05 18:46:58 +09:00
Bartłomiej Dach
efb08aeed3 Switch unnecessary wait steps to asserts 2020-08-02 14:54:41 +02:00
Bartłomiej Dach
f412808331 Check rotation with bigger tolerance to account for damp 2020-08-02 13:26:48 +02:00
Dean Herbert
fb74195d83 Move InputManager implementation to base skinnable test scene class 2020-07-31 10:45:10 +09:00
Dean Herbert
023feaf438 Refactor to centralise implementation into a single component 
Turns out this is a better way forward.
 2020-07-29 22:31:52 +09:00
Dean Herbert
d01d1ce3f1 Add initial support for spinner disc skinning 2020-07-29 16:25:10 +09:00
Dean Herbert
c3c60334ec Add skinning support to spinner test scene 2020-07-29 15:35:08 +09:00
Dean Herbert
afceab685b
Merge pull request #9688 from peppy/less-spinner-bonus-score 
Reduce spinner tick and bonus score
 2020-07-28 14:21:48 +09:00
Dean Herbert
dc577aa6fa Fix display of bonus score 2020-07-28 11:22:58 +09:00
Bartłomiej Dach
7ad3101d08 Bring back custom fade-out delay if hit lighting is on 2020-07-27 19:21:01 +02:00
Bartłomiej Dach
bbc7d69524 Add failing test cases 2020-07-27 19:07:21 +02:00
Dean Herbert
06c4fb7171 Update bonus score spec in test 2020-07-27 18:40:53 +09:00
Dean Herbert
0050f6348f
Merge branch 'master' into add-spinner-bonus-score 2020-07-23 23:05:04 +09:00
Dean Herbert
acff270e96 Fix failing test by moving slider closer 2020-07-23 19:14:18 +09:00
Dean Herbert
a4680d7a89 Reduce test range as to not hit spin cat 2020-07-21 19:22:42 +09:00
Dean Herbert
35d53139e7 Merge branch 'master' into add-spinner-bonus-score 2020-07-21 11:21:17 +09:00
Dean Herbert
55d921ef85 Improve feel of animation 2020-07-20 17:22:30 +09:00
smoogipoo
9f7750e615 Add texture wrapping support to skins 2020-07-17 16:54:30 +09:00
Dean Herbert
8411a36a0f
Merge pull request #9545 from smoogipoo/reset-judgement-animation 2020-07-14 07:35:53 +09:00
dependabot-preview[bot]
8087a75c35
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0 
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-13 17:22:39 +00:00
smoogipoo
53520ec7c4 Add test 2020-07-13 21:21:59 +09:00
Dean Herbert
b68a2d885c Add testability against different background colours / with user input 2020-07-10 14:47:26 +09:00
Dean Herbert
fee19753e1 Fix animations not playing correctly in test scene due to too many calls to OnPressed 2020-07-10 14:47:11 +09:00
Dean Herbert
13618915b7 Don't show cursor guide in gameplay cursor test 2020-07-10 14:46:49 +09:00
Dean Herbert
efb2c2f4ae Rename variable to be more clear on purpose 2020-07-09 12:01:00 +09:00
Bartłomiej Dach
31a1f8b9a7 Add coverage for spinning in both directions 2020-07-08 22:37:45 +02:00
Bartłomiej Dach
37ecab3f2f Add assertions to make spinner tests fail 2020-07-08 21:09:27 +02:00
smoogipoo
b3e200ee7f Re-invert test 2020-06-22 21:00:35 +09:00
smoogipoo
261adfc4e6 Create a local playable beatmap instead 2020-06-22 18:38:41 +09:00
smoogipoo
863666f7c4 Move accuracy heatmap to osu! ruleset, rename, remove magic number 2020-06-19 21:14:31 +09:00
Dean Herbert
0b6e8783d4
Merge branch 'master' into test-scene-create-ruleset 2020-06-12 17:06:27 +09:00
Dean Herbert
7dc19220e5 Apply new resharper formatting fixes 2020-06-09 23:38:54 +09:00
Salman Ahmed
741fa20149
Use CreateRuleset() for editor test scenes as well 2020-06-04 00:47:10 +03:00
Salman Ahmed
611f64fd36
Add base ready-made abstract scene for osu! mod tests 2020-06-03 23:24:00 +03:00
Salman Ahmed
84b40ea2c6
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset 
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
 2020-06-03 22:00:02 +03:00
Dean Herbert
c46bfc2532 Create SnapResult class to hold various snapping results 2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38 Change snapping to be screen space coordinate based 2020-05-20 21:00:29 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
dependabot-preview[bot]
03863d901b
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-27 08:59:09 +00:00
Salman Ahmed
227503c0af
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset 2020-04-23 16:25:33 +03:00
Salman Ahmed
2fa47992dc
Seal the ruleset creation methods and let abstract method take their place 
Also makes `CreatePlayerRuleset()` and `CreateRulesetForSkinProvider()` not-null to avoid unwanted behaviour with their derivers
 2020-04-23 13:27:12 +03:00
smoogipoo
8d5732aabd Make placements happen on mouse down 2020-04-23 12:17:11 +09:00
Dean Herbert
5a2129da7c
Merge branch 'master' into allow-cancelling-completion 2020-04-21 11:22:37 +09:00
Dan Balasescu
eb7b04d8bc
Merge branch 'master' into fix-osu-hidden-mod-alt 2020-04-20 17:47:27 +09:00
Salman Ahmed
4c945b5feb Merge remote-tracking branch 'upstream/master' into allow-cancelling-completion 2020-04-20 06:43:30 +03:00
Salman Ahmed
fc6c245de5 Replace all judged event logic with HasCompleted bindable 2020-04-19 05:36:04 +03:00
Salman Ahmed
155bc8b49a Remove ModTestScene ruleset parameter on constructor and use CreateRuleset instead 2020-04-17 11:17:59 +03:00
Salman Ahmed
92df4e3a9e Remove PlayerTestScene constructor and use CreateRuleset method instead 2020-04-17 11:17:51 +03:00
Salman Ahmed
5fa6bcb5a3 Move SkinnableTestScene into using the global CreateRuleset method 2020-04-17 11:17:44 +03:00
smoogipoo
08df9d49e5 Add failing test 2020-04-17 14:12:43 +09:00
smoogipoo
ee5301b887 Fix head/tail circles not getting correct hit windows 2020-04-17 14:12:38 +09:00
Dean Herbert
9dda7da489 Fix spinners being considered the "first object" for increased visibility in hidden 2020-04-16 14:11:38 +09:00
Dean Herbert
63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
smoogipoo
9a65aa18d7 Fix connections hidden due to overlapping controlpoints 2020-04-13 16:13:14 +09:00
smoogipoo
bde0b259c1 Improve slider placement test scene 2020-04-13 15:31:54 +09:00
smoogipoo
15a92d1451 Rename test scene 2020-04-10 03:07:44 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
Dean Herbert
0a340bac5a Ensure the correct (up-to-date) ruleset is retrieved 2020-04-07 16:20:13 +09:00
Dean Herbert
2c840c52a3 Add skinnable test scene per ruleset to better allow dynamic compilation 2020-04-07 16:20:13 +09:00
Bartłomiej Dach
3ff27816be Trim excess newlines 2020-04-05 15:54:50 +02:00
Bartłomiej Dach
25c9674487 Rename method to justify its existence better 2020-04-05 15:54:15 +02:00
Bartłomiej Dach
f9e44ae53e Bring back comment about AlmostEquals 2020-04-05 15:53:56 +02:00
Bartłomiej Dach
7135c99746 Final cleanups 2020-04-05 15:39:32 +02:00
Bartłomiej Dach
c817cc726a Rewrite repeat arrow test 2020-04-05 15:37:31 +02:00
Bartłomiej Dach
cbc546905f Rewrite snaking tests 2020-04-05 15:26:32 +02:00
Bartłomiej Dach
4170c210b2 Centralise hitobject start time calculation 2020-04-05 13:50:27 +02:00
Bartłomiej Dach
d68c45e22b Use ElementAt() where applicable 2020-04-05 13:47:30 +02:00
Endrik Tombak
8d3e228f78 Split and rename tests 2020-04-05 11:22:52 +03:00
Endrik Tombak
0ebb5a81f9 Fix oversight in testing 2020-04-04 15:59:39 +03:00
Endrik Tombak
8eb5eeedc6 Merge branch 'master' of https://github.com/ppy/osu into test-snaking 2020-04-04 15:35:43 +03:00
Endrik Tombak
a8a52e506d Review and style changes 2020-04-04 15:35:35 +03:00
Endrik Tombak
c3f0ef1bd4 Major DRYing of code 2020-04-04 15:10:54 +03:00
Dean Herbert
a3d4212462 Fix weird slider ball sizing 2020-04-02 19:56:33 +09:00
smoogipoo
1ff60b73d7 Refactor tests a bit 2020-03-30 17:01:29 +09:00
smoogipoo
e074c3e5e9 Add additional tests 2020-03-30 16:15:07 +09:00
smoogipoo
b9277165f7 Refactor test to support custom hitobjects 2020-03-30 15:12:12 +09:00
smoogipoo
3f8fbebbb4 Merge branch 'master' into add-notelock 2020-03-30 15:01:39 +09:00
Dan Balasescu
a0b8243f4c
Merge branch 'master' into slider-start-circle 2020-03-30 14:49:17 +09:00
Endrik Tombak
ce2fa23baf Include a test for miss 2020-03-29 17:43:18 +03:00
Endrik Tombak
11826800fb Test slider snaking 2020-03-29 17:00:26 +03:00
Dean Herbert
fb4b334ce2 Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay 2020-03-28 14:10:26 +09:00
杜Nate
9ea0137b01
Merge branch 'master' into spun-out 2020-03-23 18:13:53 +08:00
Dean Herbert
0b728f483f Rename base test class to help avoid incorrect reference 2020-03-23 10:01:33 +09:00
Salman Ahmed
97076325c4 Fix test scenes using framework-testing-specifc test scene 2020-03-23 01:45:13 +03:00
smoogipoo
12a48d2774 Cause all earlier hitobjects to get missed 2020-03-19 19:16:24 +09:00
smoogipoo
f285b43a74 Allow simultaneous hitobjects 2020-03-19 17:45:08 +09:00
Dean Herbert
3489514b65 Fix tests asserting incorrectly 2020-03-19 17:15:53 +09:00
Dean Herbert
08b5ab8ec4 SliderRepeatPoint -> SliderRepeat 2020-03-19 14:42:02 +09:00
Dean Herbert
94c3ffb6e5 Fix slider ticks contributing to accuracy 2020-03-19 14:36:15 +09:00
smoogipoo
80a86102b6 Add test 2020-03-18 17:00:48 +09:00
Dean Herbert
0be423183d Rename data class 2020-03-11 00:36:56 +09:00
Dean Herbert
66a0f3334d
Merge branch 'master' into fix-perfect-judgements 2020-03-10 23:50:57 +09:00
smoogipoo
678f33eea3 Add late miss judgements 2020-03-10 15:45:21 +09:00
smoogipoo
9d5327b1ac Fix osu! shaking instead of missing for early hits 2020-03-10 15:00:23 +09:00
Bartłomiej Dach
d5dda05d98 Merge branch 'master' into fix-perfect-judgements 2020-03-08 14:06:18 +01:00
Bartłomiej Dach
b608764554 Cover area just outside circle in test 2020-03-06 22:09:02 +01:00
Bartłomiej Dach
491840b17d Add failing tests 2020-03-06 21:10:23 +01:00
Dean Herbert
5b8aaba4a6 Merge branch 'master' into fix-perfect-judgements 2020-03-06 00:18:05 +09:00
Dean Herbert
583e2c3f4a Actually check rate is applied 2020-03-06 00:10:05 +09:00
Dean Herbert
2b89fb68f7
Merge branch 'master' into fix-testscene-rate 2020-03-05 23:38:33 +09:00
Dean Herbert
9a12909f09 Test ModDifficultyAdjust is actually taking effect 2020-03-05 11:55:20 +09:00
Dean Herbert
26ce0d05d6 Use autoplay mod rather than local replay provider 2020-03-05 11:33:30 +09:00
Dean Herbert
77fddcd2c2 Merge branch 'less-test-players' into mod-testscene 2020-03-05 11:26:33 +09:00
Dean Herbert
5200633f9f Centralise TestPlayer implementations as much as possible 2020-03-05 11:25:07 +09:00
Dean Herbert
fadebcdc03 Move all sets to object initialiser for code formatting reasons 2020-03-05 10:21:25 +09:00
Dean Herbert
3b19467ead ModTestCaseData -> ModTestData 2020-03-05 10:19:42 +09:00
Dean Herbert
0f1f1d1a6b Remove unused "name" parameter 2020-03-05 10:18:37 +09:00
Dean Herbert
2a581ef247 Remove required types 2020-03-05 10:15:17 +09:00
Dean Herbert
ce3786cfd9 Rename to ModTestScene (is no longer a sandbox) 2020-03-05 10:11:27 +09:00
杜Nate
cf88e3ff19
Merge branch 'master' into spun-out 2020-03-04 17:38:35 +08:00
voidedWarranties
c3f840cc1a Fix Autoplay = false and AllowFail behavior 2020-03-03 17:12:01 -08:00
smoogipoo
5e218697c5 Use stacked positions 2020-03-04 09:46:53 +09:00
smoogipoo
d11d29c1f7 Adjust namespaces 2020-03-03 15:30:53 +09:00
smoogipoo
cc5b44e466 Add test scene 2020-03-03 13:36:55 +09:00
smoogipoo
6d939e9d41 Add failing test scenes 2020-03-02 12:42:48 +09:00
smoogipoo
ce7cbf29ca Move to using test methods for better separation 2020-03-02 12:20:25 +09:00
smoogipoo
239cfddcbb Improve test scenes/cases 2020-03-02 10:50:41 +09:00
smoogipoo
a02c5710ac Rename base class 2020-03-02 10:06:49 +09:00
voidedWarranties
089ec4c792 Test scene for mod development 2020-02-29 21:16:28 -08:00
Dean Herbert
06fcb48d65 Move SkinnableTestScene to main project for consumption by other rulesets 2020-02-17 14:19:39 +09:00
Dean Herbert
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
Bartłomiej Dach
403c03841d Decouple test scene & add assertions 2020-02-10 21:40:21 +01:00
dependabot-preview[bot]
48781e5685 Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 08:24:12 +00:00
杜Nate
8d480c794a
Merge branch 'master' into spun-out 2020-02-08 13:54:39 +08:00
mcendu
715608c798 Fix test applying incorrect mod 2020-02-08 10:49:49 +08:00
mcendu
204c2f0bde add tests 2020-02-08 10:16:04 +08:00
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +09:00
Dean Herbert
84fcf45aae Make slider tracking match what is on screen 2020-02-03 11:55:14 +09:00
Dean Herbert
9426f786e9 Use slightly closer values 2020-02-03 10:33:56 +09:00
Dean Herbert
2253ed4c0d Move path length to a constant 2020-02-03 10:29:40 +09:00
Dean Herbert
edb4c0f752 Add blank lines for conformity 2020-02-03 10:24:53 +09:00
TheWildTree
017ce3d1ec Merge branch 'fix-follow-circle' of https://github.com/TheWildTree/osu into fix-follow-circle 2020-02-02 21:25:44 +01:00
TheWildTree
162a3713a3 Modify tests to avoid fails in CLI testing 2020-02-02 21:25:35 +01:00
Tree
c7f1d4a8a0
Remove unnecessary newline 2020-02-02 19:29:26 +01:00
TheWildTree
fd7fccbb62 Add tests 2020-02-02 19:16:54 +01:00
Dean Herbert
f8aee122b6 Merge remote-tracking branch 'upstream/master' into exit-all-screens-centrally 2020-01-31 22:09:12 +09:00
Dean Herbert
97c3ce132b Fix incorrect nUnit adapter version causing rider failures 2020-01-31 15:01:37 +09:00
Dean Herbert
e6783b622d Fix incorrectly build tests 2020-01-31 14:56:42 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
dependabot-preview[bot]
f91637e7b6
Bump NUnit3TestAdapter from 3.15.1 to 3.16.0 
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 07:41:37 +00:00
Dan Balasescu
8a85875cbf
Merge branch 'master' into add-spinner-bonus-score 2020-01-03 18:08:26 +09:00
Dan Balasescu
c07cfce3b3
Merge branch 'master' into resource-assembly 2020-01-03 17:56:25 +09:00
smoogipoo
8c378dc625 Move EditorBeatmap construction/conversion to Editor 2019-12-30 14:51:14 +09:00
Huo Yaoyuan
1b33581667 Construct DllResourceStore with assemblies 2019-12-28 21:13:18 +08:00
smoogipoo
6069d98ced Remove generic editor beatmap 2019-12-27 19:39:30 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
Dean Herbert
3485ef33a7 Rename tests and add missing coverage 2019-12-25 15:05:08 +09:00
Dean Herbert
9090d13e05 Simplify tests 2019-12-25 15:01:05 +09:00
Dean Herbert
04cbdd9c6c Make test easier to visually examine 2019-12-25 14:55:13 +09:00
smoogipoo
c766477abc Fix testcase containing bad hitobject 2019-12-23 19:08:16 +09:00
Salman Ahmed
a6632cf1ef Remove unnecessary skin requester and user-skin providing container 2019-12-21 12:53:05 +03:00
Salman Ahmed
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
Salman Ahmed
8d0dd1497b Add legacy beatmap skin test scene with combo colours tests 2019-12-21 12:30:30 +03:00
Dean Herbert
419656cea4
Merge branch 'master' into add-spinner-bonus-score 2019-12-20 19:55:53 +09:00
Dean Herbert
492a910671 Update missed launch configurations 2019-12-20 19:08:05 +09:00
Huo Yaoyuan
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
Dean Herbert
d4a4efb734 Tidy up test 2019-12-18 16:07:14 +09:00
Salman Ahmed
f359a79b7e Add test ensuring correct SPM calculation on rewinding 2019-12-18 03:08:05 +03:00
Salman Ahmed
12a02cf6d9 Extend spinner duration a bit 
To allow the times sought to be in the spinner time range
 2019-12-18 03:07:06 +03:00
Dean Herbert
88ce4c12f0 Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-12-17 14:09:28 +09:00
Dean Herbert
6e1f10ad8d Merge remote-tracking branch 'upstream/master' into add-old-skin-to-osu-tests 2019-12-17 13:56:01 +09:00
Dean Herbert
9875fcea99 Add numbers to old skin for better identification 2019-12-17 13:54:25 +09:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
7033974733 Fix test regressions (incorrect from the start) 2019-12-13 20:13:32 +09:00
Salman Ahmed
c6cbf0f28a Add 1.0 skin to osu! ruleset test 2019-12-12 16:27:11 +03:00
Dean Herbert
06352a95be Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-12-11 20:02:51 +09:00
smoogipoo
3358ab9f8a Adjust diffcalc test expected value 
The difference is caused by the reworked calculateLength() of SliderPath. This comes as a result of the increased accuracy of path lengthenings due to calculating the final position relative to the second-to-last point, rather than relative to the last point.
 2019-12-06 15:53:01 +09:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +09:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Dean Herbert
8d1b11d4bd Add storyboard lead-in tests 2019-11-21 18:50:54 +09:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f Use ??=. 2019-11-12 19:56:51 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
smoogipoo
df31acb294 Fix slider nested hitobject samples not getting updated 2019-11-08 15:43:34 +09:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
dependabot-preview[bot]
f2084df0bb
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.3...v16.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 06:19:49 +00:00
Dean Herbert
41a8954b81
Refactor follow points to support dynamic updates (#6721) 
Refactor follow points to support dynamic updates

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-06 17:43:58 +09:00