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

25714 Commits

Author SHA1 Message Date
Dean Herbert
ed368e44ea
Merge branch 'master' into safe-screen-lease 2020-02-01 02:11:18 +09:00
Dan Balasescu
9a1df491cd
Merge pull request #7690 from peppy/exit-all-screens-centrally
Centralise screen exit logic to ScreenTestScene
2020-02-01 02:03:07 +09:00
Dean Herbert
c4331f34d5 Consume TearDownSteps 2020-01-31 22:09:39 +09: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
3e15265a53 Update framework 2020-01-31 22:09:02 +09:00
Dean Herbert
a66cdee5e9 Fix missed issues 2020-01-31 21:36:19 +09:00
Dean Herbert
19f516e710 Ensure OsuScreen level leases are taken out synchronously 2020-01-31 19:10:44 +09:00
Dean Herbert
a547d2ed5c Don't least at Player just yet 2020-01-31 18:37:16 +09:00
Dean Herbert
2f61d3f5ad Fix song select remaining issue locally 2020-01-31 17:35:53 +09:00
Dean Herbert
f736bbfccb
Merge pull request #7691 from peppy/fix-incorrect-nunit
Fix incorrect nUnit adapter version causing rider failures
2020-01-31 17:05:53 +09:00
Dean Herbert
ab7bbf38a8 Set default beatmap later in test initialisation 2020-01-31 16:14:55 +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
Dean Herbert
5f48affcba Centralise screen exit logic to ScreenTestScene 2020-01-31 14:19:29 +09:00
Dan Balasescu
d5b9df049b
Merge pull request #7683 from peppy/fix-chat-test-failure
Fix chat test intermittently failing
2020-01-31 10:56:04 +09:00
Dean Herbert
40a4435792 Fix chat test intermittently failing
Was throwing exception instead of returning false due to LINQ Single() call.
2020-01-31 00:33:24 +09:00
Dean Herbert
8193991445
Merge pull request #7675 from smoogipoo/fix-possible-chat-crash
Fix possible crash when searching with no channel topic
2020-01-30 18:22:23 +09:00
Dean Herbert
947ee7a055
Merge pull request #7676 from peppy/fix-replay-initial-frames
Fix negative replay frames being played back incorrectly
2020-01-30 17:18:36 +09:00
Dan Balasescu
3fe84e0ddf
Merge branch 'master' into fix-replay-initial-frames 2020-01-30 16:56:37 +09:00
Dean Herbert
d03723303d
Fix typo in comment 2020-01-30 16:29:15 +09:00
Dan Balasescu
dfd0b1b88c
Merge pull request #7663 from peppy/fix-import-different-ruleset
Fix presenting a beatmap from a different ruleset not working
2020-01-30 15:36:25 +09:00
Dan Balasescu
7b403fd57a
Merge pull request #7673 from peppy/catch-relax-input-allowance
Fix osu!catch not handling all vertical space
2020-01-30 15:35:49 +09:00
Dan Balasescu
3604730027
Merge branch 'master' into fix-replay-initial-frames 2020-01-30 15:16:24 +09:00
Dan Balasescu
b57421247f
Merge branch 'master' into catch-relax-input-allowance 2020-01-30 15:16:16 +09:00
Dan Balasescu
09f6c57b0f
Merge branch 'master' into fix-import-different-ruleset 2020-01-30 15:08:25 +09:00
smoogipoo
2fb640f57f Change to until step + fix CI error 2020-01-30 15:00:39 +09:00
Dean Herbert
7b4a658264 Fix negative replay frames being played back incorrectly 2020-01-30 14:54:57 +09:00
Dan Balasescu
fb51ffc169
Merge pull request #7667 from peppy/editor-match-accessibility
Fix editor being accessible for multiplayer song select
2020-01-30 14:38:30 +09:00
smoogipoo
ce36e5458f Fix possible crash with no channel topic 2020-01-30 14:35:03 +09:00
Dan Balasescu
33d964994c
Merge pull request #7671 from peppy/rename-deleted-count
Rename and tidy up DeletedCommentsCounter
2020-01-30 14:20:38 +09:00
Dan Balasescu
c18b1b302c
Merge branch 'master' into editor-match-accessibility 2020-01-30 13:49:56 +09:00
Dan Balasescu
3d814e7714
Merge branch 'master' into rename-deleted-count 2020-01-30 13:49:54 +09:00
Dan Balasescu
2beb10b860
Merge pull request #7670 from TheWildTree/recolor-profile-sections
Bring UserProfileOverlay colour scheme in line with web
2020-01-30 13:48:33 +09:00
Dan Balasescu
1239dd93dc
Merge branch 'master' into recolor-profile-sections 2020-01-30 13:30:35 +09:00
Dean Herbert
d8ce1fd86c Fix osu!catch not handling all vertical space 2020-01-30 13:23:39 +09:00
smoogipoo
4ca3f216b8 Fix test scene 2020-01-30 13:11:35 +09:00
smoogipoo
17978035ea Fix uncaught inconsistent naming 2020-01-30 12:50:15 +09:00
smoogipoo
da2c245083 Change to pink colour scheme 2020-01-30 12:36:47 +09:00
smoogipoo
d7d7ab48d3 Cleanup 2020-01-30 12:36:38 +09:00
Dean Herbert
c158570249
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-30 11:31:34 +09:00
Dean Herbert
b107026d50
Merge pull request #7389 from vruss/mod_content_centering
Fix footer button content not correctly being centered
2020-01-30 11:17:45 +09:00
Dean Herbert
ebdb425c50 Rename and tidy up DeletedCommentsCounter 2020-01-30 11:17:26 +09:00
Dean Herbert
f72de235cc Remove unnecessary length specifications 2020-01-30 11:00:14 +09:00
Dean Herbert
37ecf8a060 Remove commented line 2020-01-30 10:50:48 +09:00
Dean Herbert
bea20efb64
Merge branch 'master' into mod_content_centering 2020-01-30 10:34:46 +09:00
TheWildTree
ef92c26c17 Recolor ProfileSection 2020-01-29 22:26:21 +01:00
TheWildTree
f7c38da030 Match web border height 2020-01-29 22:25:56 +01:00
TheWildTree
87521f35ed Recolor buttons 2020-01-29 22:25:28 +01:00
TheWildTree
06eded16e2 Recolor DetailHeaderContainer 2020-01-29 22:10:58 +01:00
TheWildTree
85990cdcdb Recolor MedalHeaderContainer 2020-01-29 22:10:48 +01:00