1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 18:32:56 +08:00
Commit Graph

26813 Commits

Author SHA1 Message Date
Dean Herbert
89cdf8ec2b Merge remote-tracking branch 'origin/decouple-mod-select-bindable' into present-replay-from-ss 2020-02-01 02:14:11 +09:00
Dean Herbert
d94045e612 Fix remaining merge conflict 2020-02-01 02:12:50 +09:00
Dean Herbert
ed368e44ea
Merge branch 'master' into safe-screen-lease 2020-02-01 02:11:18 +09:00
Dean Herbert
3291d7b6c9
Merge branch 'master' into present-replay-from-ss 2020-02-01 02:08:00 +09:00
Dean Herbert
c5422743e2
Merge branch 'master' into decouple-mod-select-bindable 2020-02-01 02:06:23 +09:00
Dean Herbert
90caa61245
Reverse comparison for readability
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-01 02:05:26 +09:00
Dean Herbert
8db1a8ddb9
Merge branch 'master' into perform-from-screen 2020-02-01 02:04:30 +09:00
Dean Herbert
b3e63d8869
Merge branch 'master' into fix-chat-tab-shortcuts 2020-02-01 02:03:43 +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
e728d2be17 Use ElementAtOrDefault 2020-02-01 01:19:04 +09:00
Dean Herbert
0c305b96d1
Merge branch 'master' into fix-chat-tab-shortcuts 2020-01-31 22:22:04 +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
Andrei Zavatski
3b5b799d60 Adjust height of ShowMore button 2020-01-31 09:51:56 +03:00
Andrei Zavatski
4a444face1 Change ShowMoreButton hide logic 2020-01-31 09:46:35 +03:00
Andrei Zavatski
91f7bc6d45 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder 2020-01-31 09:43:23 +03: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
9a1907d8e0
Apply doc fixes from code review
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-31 09:48:20 +09:00
Tree
b03e7f12ff
Remove unused directive 2020-01-30 22:51:35 +01:00
TheWildTree
c050eed79b Recolour RankGraphTooltip 2020-01-30 22:05:06 +01:00
TheWildTree
caf76511a7 Remove double negation 2020-01-30 21:45:42 +01:00
Bartłomiej Dach
1553444001 Fix channel tab keyboard shortcut
Filter out the selector tab item at the point of enumerating tabs to fix
the regression of the Alt+number key shortcut.
2020-01-30 21:44:53 +01:00
TheWildTree
c38dc81535 Remove unnecessary using 2020-01-30 21:39:06 +01:00
Bartłomiej Dach
fcd05b5a3c Add failing test 2020-01-30 21:31:25 +01:00
TheWildTree
a3877cc29e Recolour RankGraph circle 2020-01-30 20:55:44 +01:00
TheWildTree
3970151e31 Improve condition check 2020-01-30 20:51:33 +01:00
TheWildTree
1751e96840 Recolour ProfileHeaderButton 2020-01-30 19:45:12 +01:00
TheWildTree
e69d93ae5c Adjust ProfileTabControl height 2020-01-30 19:26:42 +01:00
TheWildTree
de9a1737a5 Recolour LevelProgressBar 2020-01-30 18:18:42 +01:00
TheWildTree
754200d843 Fix padding when user has no additional info 2020-01-30 18:10:40 +01:00
TheWildTree
682d0e6e71 Fix typo in variable 2020-01-30 17:46:59 +01: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
f51cfa2220 Fix too many ticks being displayed on beatmaps with multiple timing sections
Closes https://github.com/ppy/osu/issues/7681.
2020-01-31 00:24:00 +09:00
Dean Herbert
14f88bb725 Merge branch 'perform-from-screen' into present-replay-from-ss 2020-01-30 23:45:51 +09:00
Dean Herbert
6b24b7687f Add test coverage 2020-01-30 23:45:15 +09:00
Dean Herbert
878250056c Remove unused parameter 2020-01-30 23:34:04 +09:00
Andrei Zavatski
3db4c11f29 CI fix 2020-01-30 14:05:55 +03:00
Andrei Zavatski
3002366e70 Adjust mode part 2020-01-30 13:56:19 +03:00
Andrei Zavatski
3f62c40e70 Increase spacing 2020-01-30 13:55:50 +03:00
Dean Herbert
8e966624e0 Fix regressing tests 2020-01-30 19:55:25 +09:00