1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

1646 Commits

Author SHA1 Message Date
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes 2019-07-24 18:37:31 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Dean Herbert
eca63980d2 Add comprehensive scaling mode tests 2019-07-22 14:43:07 +09:00
Dean Herbert
74c961bcff Add more flexible skin element confine modes 2019-07-22 14:42:56 +09:00
Andrei Zavatski
c8192d6f3a Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-07-14 19:10:47 +03:00
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di 2019-07-12 23:14:12 +09:30
Lucas A
09d679de8d Move text display layout to Toast. 2019-07-12 08:50:53 +02:00
Dean Herbert
671f7f99cd Use constant for blur amount 2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16 Don't expose dimmable container creation in player 2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b Move classes to local namespaces
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
0d9f978857 Don't expose DimContainer 2019-07-12 11:38:15 +09:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements 2019-07-11 23:46:02 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability 2019-07-11 23:10:28 +09:00
StanR
cd7c03c13a Add genre and language sections to beatmapset overlay 2019-07-11 16:44:48 +03:00
Dean Herbert
2c62891c48 Make Toast base class abstract 2019-07-11 15:15:34 +09:00
Dean Herbert
3bc789fca8 Remove osd prefix and prefer upper-case OSD 2019-07-11 15:09:54 +09:00
David Zhao
6c0de0b436 Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-11 13:33:35 +09:00
David Zhao
321266e96f Make UserDimContainer abstract 2019-07-11 13:17:28 +09:00
Andrei Zavatski
953d32366c Move request inside the ScoresContainer again 2019-07-10 19:40:29 +03:00
Andrei Zavatski
a041421e0d Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-10 19:39:41 +03:00
Dean Herbert
e23d42522c
Merge pull request #5295 from peppy/fix-misc-inspections
Fix a few inspections from EAP r#
2019-07-11 00:56:18 +09:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score 2019-07-11 00:31:26 +09:00
David Zhao
221ee58f55 make storyboard text more visible 2019-07-10 12:36:58 +09:00
David Zhao
7929104b8a move default into StoryboardContainer, fix load bug, remove comment 2019-07-10 12:24:05 +09:00
Andrei Zavatski
9907a58ec4 Revert animations and apply suggested changes 2019-07-09 17:38:17 +03:00
Dean Herbert
a0d048ad8d Don't test the logo
Breaks main menu adding
2019-07-09 19:31:53 +09:00
Dean Herbert
2d0e6652f9 Ensure logo doesn't get stuck tracking 2019-07-09 18:59:56 +09:00
Dean Herbert
8eeba069cc Ensure logo isn't left in a bad state on re-run 2019-07-09 18:51:10 +09:00
Andrei Zavatski
276873ff8a remove unused field 2019-07-09 12:28:59 +03:00
Dean Herbert
e3e72a6276 Reorganise tests and add restart step 2019-07-09 18:21:43 +09:00
Andrei Zavatski
e8b9b1b0bf visibility logic adjustments 2019-07-09 12:16:58 +03:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
Dean Herbert
32fb811bc9 Merge branch 'master' into intro-testing-improvements 2019-07-09 18:05:52 +09:00
Andrei Zavatski
8d6af1625a Visibility improvements 2019-07-09 11:40:51 +03:00
David Zhao
89cb8a0cac Move storyboard initialization to new StoryboardContainer 2019-07-09 16:23:59 +09:00
Andrei Zavatski
eb4ef8f6ac CI fixes 2019-07-09 08:25:10 +03:00
Andrei Zavatski
5d81445454 Move api request outside the scores container 2019-07-09 08:05:34 +03:00
Andrei Zavatski
59cfd39670 Add testcase 2019-07-08 12:02:10 +03:00
iiSaLMaN
129899f419 Add a BPM property in BeatmapInfo 2019-07-08 10:43:35 +03:00
Dean Herbert
72362d92d4 Fix a few inspections from EAP r# 2019-07-08 16:34:11 +09:00
iiSaLMaN
90d5484818 Return BPM back to OnlineInfo
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
iiSaLMaN
31e1d204d4 Add test for sorting by BPM and Length 2019-07-07 18:27:12 +03:00
Dean Herbert
cd31d2bc05 Simplify tests 2019-07-07 13:06:31 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder 2019-07-06 12:09:28 -07:00
Joehu
5767f4360e Remove unnecessary test checks 2019-07-06 12:07:13 -07:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
Dean Herbert
6bee26cfc9 Rename to match 2019-07-06 19:05:37 +09:00
Dean Herbert
58183ad3d5 Change intro test to test full intro screen 2019-07-06 19:05:12 +09:00
Dean Herbert
64de3840b0 Add missing wait step in TestScenePlayerLoader 2019-07-06 15:25:53 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
Lucas A
bc60b1dc13 Add test for empty OsdToast 2019-07-05 16:04:47 +02:00
Dean Herbert
39bd5e6478 Add test 2019-07-05 15:50:31 +09:00
Joehu
1534b75d27 Fix ci errors 2019-07-04 21:39:21 -07:00
Joehu
04ef6c4d45 Add beatmap status tests 2019-07-04 21:25:10 -07:00
David Zhao
4eb01b12be Convert to method 2019-07-05 13:10:59 +09:00
David Zhao
9eeafa0861 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
Dean Herbert
29bc2a2751 Split out tests 2019-07-05 11:29:47 +09:00
Dean Herbert
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
Dean Herbert
1b36860169 Fix test cross-talk 2019-07-04 19:26:12 +09:00
Dean Herbert
2dc356a24e Remove using 2019-07-04 18:47:43 +09:00
Dean Herbert
86e9d97b6a Adjust variables and test length to avoid random failures 2019-07-04 18:38:29 +09:00
Dean Herbert
73bc71f8b2 Use local clock to add consistency to skip times 2019-07-04 17:32:58 +09:00
David Zhao
07078b735c use new vector2 2019-07-04 17:06:28 +09:00
David Zhao
8e951d423f Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-04 17:05:47 +09:00
David Zhao
530675f364 Add tests as separate steps 2019-07-04 17:05:29 +09:00
Dean Herbert
db24ac28ec Add tests 2019-07-04 16:53:08 +09:00
Dean Herbert
4885f0f0c7 Add messaging telling users how to leave changelog comments 2019-07-04 15:47:06 +09:00
Andrei Zavatski
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI 2019-07-02 15:55:30 +05:30
Andrei Zavatski
2971bd8cbc Add disable trigger to a testcase 2019-07-02 13:22:38 +03:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4 2019-07-02 13:24:16 +09:00
Dean Herbert
e25158f434 Rename move and fix tests 2019-07-01 19:35:04 +09:00
Dean Herbert
5d94c67c76 Merge remote-tracking branch 'upstream/master' into selector-hiding 2019-07-01 18:49:18 +09:00
naoey
d8f6bbc90e
Disable replay button when replay is unavailable 2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes 2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
bc52f76556
Move replay button to score card 2019-06-29 10:55:30 +05:30
Dean Herbert
e8ea0594b4
Fix ruleset selector line not moving on first display (#5168)
Fix ruleset selector line not moving on first display

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

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

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
smoogipoo
243cd517ad Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
2019-06-12 17:24:16 +09:00
smoogipoo
28f8b04765 Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 2019-06-12 16:47:56 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
bb8a77d27d Apply all steps to same user panel so interactions can be observed 2019-06-12 15:59:52 +09:00
smoogipoo
5d3fa51360 Merge remote-tracking branch 'origin/master' into selection-update 2019-06-12 15:10:57 +09:00
KingLuigi4932
529bde14af Merge branch 'not-available-to-download' of https://www.github.com/iiSaLMaN/osu into not-available-to-download 2019-06-11 23:11:52 +03:00