1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Commit Graph

20157 Commits

Author SHA1 Message Date
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter 2019-07-06 13:27:49 +09:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
Dean Herbert
a7977ad557
Allow PlayerLoader to proceed even if the mouse is hovering an… (#5263)
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-06 01:06:18 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
Dan Balasescu
b8d3db4d37
Merge pull request #5244 from peppy/changelog-comments
Add messaging telling users how to leave changelog comments
2019-07-06 00:08:53 +09:30
Dan Balasescu
f32796db5c
Merge branch 'master' into changelog-comments 2019-07-05 23:42:46 +09:30
Dean Herbert
2432878614
Add local score import from stable (#5072)
Add local score import from stable

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 16:24:39 +09:00
David Zhao
a259247a98 use const 2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores 2019-07-05 15:54:33 +09:00
Dean Herbert
2626a26485
Add a check if the locally available score has files (#5260)
Add a check if the locally available score has files

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 15:54:27 +09:00
Dean Herbert
39bd5e6478 Add test 2019-07-05 15:50:31 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
Dean Herbert
7ce2e1c5ee
Lock WorkingBeatmap cache to avoid threading issues (#5243)
Lock WorkingBeatmap cache to avoid threading issues
2019-07-05 15:41:35 +09:00
Dean Herbert
b902457f8d Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel 2019-07-05 15:32:07 +09:00
Dean Herbert
49eb8b0b53
Merge branch 'master' into lock-working-cache 2019-07-05 15:14:07 +09:00
Dean Herbert
655e96b2c1
Stop import failures from being added to the imported model list (#5262)
Stop import failures from being added to the imported model list
2019-07-05 15:13:46 +09:00
Dean Herbert
04c0ce1ea3
Merge branch 'master' into import-stable-scores 2019-07-05 14:48:55 +09:00
Dean Herbert
df7d31350c Stop import failures from being added to the imported model list 2019-07-05 14:47:55 +09:00
Dean Herbert
d5a9542743
Fix incorrect xmldoc in DownloadTrackingComposite (#5261)
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
Dean Herbert
adf6d6c942 Update initial run import process to include scores 2019-07-05 14:25:52 +09:00
Dean Herbert
80d8ce8392 Fix GetStableImportPaths xmldoc 2019-07-05 14:21:56 +09:00
Dean Herbert
87c8fd0035 Fix path specification not being cross-platform compliant 2019-07-05 14:15:29 +09:00
Dean Herbert
99da04527d Replays -> scores 2019-07-05 14:07:14 +09:00
Dean Herbert
ba8df3ba92 Clean up stable lookup and mutate logic 2019-07-05 13:59:31 +09:00
Dean Herbert
8346c50ce1 Rename delete method and improve xmldoc 2019-07-05 13:55:25 +09:00
Joehu
1534b75d27 Fix ci errors 2019-07-04 21:39:21 -07:00
Dean Herbert
fcdba6b3f5
Merge branch 'master' into import-stable-scores 2019-07-05 13:34:03 +09:00
Joehu
04ef6c4d45 Add beatmap status tests 2019-07-04 21:25:10 -07:00
Dean Herbert
427d245de4
Fade out volume on game exiting (#5242)
Fade out volume on game exiting

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 13:24:05 +09:00
Joehu
e8168037f9 Fix unranked beatmap leaderboards showing "no records" placeholder 2019-07-04 21:19:51 -07:00
Dean Herbert
d77d49f595
Merge branch 'master' into fade-music-on-exit 2019-07-05 13:13:07 +09: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
naoey
f1dab946ff Remove need to trim query string 2019-07-05 08:46:17 +05:30
naoey
1dab363be3 Require supporter for filtering mods on online leaderboards 2019-07-05 08:42:44 +05:30
naoey
98a242cc37 Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter 2019-07-05 08:38:33 +05:30
iiSaLMaN
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03: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
e575c05e93 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 11:29:13 +09:00
iiSaLMaN
d624157c45 Remove unnecessary fading 2019-07-05 05:17:36 +03:00
iiSaLMaN
bff5ad22f4 Check if the locally available score has files 2019-07-05 05:16:40 +03:00
Dean Herbert
0ec01f7b0f
Bump android TargetFrameworkVersion (#5249)
Bump android TargetFrameworkVersion
2019-07-05 10:49:19 +09:00
Dean Herbert
637466b2ab
Merge branch 'master' into fix-android-targetversion 2019-07-05 10:32:00 +09:00
Dean Herbert
91d461eba7
Merge pull request #5251 from Joehuu/remove-edit-song-select-file
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
Dean Herbert
308eceb474
Fix initial colour of leaderboard mod filter (#5256)
Fix initial colour of leaderboard mod filter

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 10:29:53 +09:00
Dean Herbert
38dceddc27 Fix file ordering 2019-07-05 10:07:45 +09:00
Dean Herbert
037ea7b708
Merge branch 'master' into fix-colour-mod-filter 2019-07-05 10:04:31 +09:00
Dean Herbert
f3c01ddb4a
Fix beatmap leaderboards requiring supporter when signed out (#5255)
Fix beatmap leaderboards requiring supporter when signed out
2019-07-05 10:03:35 +09:00