1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 04:47:25 +08:00
Commit Graph

12714 Commits

Author SHA1 Message Date
Lucas A
b32b078e48 Set default keybindings for jukebox to stable's ones. 2019-07-10 21:55:43 +02:00
Lucas A
5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Lucas A
89acd9da3e Add game-wide jukebox keybindings handling to OsuGame 2019-07-05 16:33:13 +02:00
Lucas A
5cad2b2192 Add missing function to MusicController 2019-07-05 16:28:37 +02:00
Lucas A
c9e44e5e34 Add OsdIconToast + test 2019-07-05 16:25:09 +02:00
Lucas A
b5bd863dd0 Add methods to MusicController to play or pause, select next or previous track 2019-07-05 16:21:50 +02:00
Lucas A
70372dd03d Add global actions for game-wide music jukebox manipulation 2019-07-05 16:14:04 +02:00
Lucas A
df75f9d312 Revert changes made by VS to csproj 2019-07-05 16:08:02 +02:00
Lucas A
4f0429d046 Add OsdTrackedSettingToast 2019-07-05 16:03:46 +02:00
Lucas A
6288cc6e5c Refactor OnScreenDisplay to allow displaying of custom messages on OSD 2019-07-05 16:03:22 +02:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores 2019-07-05 15:54:33 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
Dean Herbert
49eb8b0b53
Merge branch 'master' into lock-working-cache 2019-07-05 15:14:07 +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
Dean Herbert
fcdba6b3f5
Merge branch 'master' into import-stable-scores 2019-07-05 13:34:03 +09:00
Dean Herbert
d77d49f595
Merge branch 'master' into fade-music-on-exit 2019-07-05 13:13:07 +09:00
iiSaLMaN
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03: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
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
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
Joehu
ae7da2557e Fix initial colour of leaderboard mod filter 2019-07-04 13:24:13 -07:00
Joehu
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
Joehu
9b2ebed669 Remove unused EditSongSelect file 2019-07-04 08:36:34 -07:00
Dean Herbert
32bb963393 Lock WorkingBeatmap cache to avoid threading issues 2019-07-04 14:33:00 +09:00
iiSaLMaN
b53aeec90d Move audio adjustment inside OnResuming 2019-07-04 05:18:29 +03:00
iiSaLMaN
99603ca0b6 Fade out game volume on exiting
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
Dean Herbert
f41c89c3be
Fix replays of converted beatmaps failing to download (#5225)
Fix replays of converted beatmaps failing to download
2019-07-04 01:50:47 +09:00
Dean Herbert
f358b69b8e
Refactor Ruleset Selector in osu!direct (#5214)
Refactor Ruleset Selector in osu!direct

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-04 01:24:58 +09:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
Dean Herbert
e55d6232d1
Merge branch 'master' into direct-ruleset-selector 2019-07-04 00:56:36 +09:00
Dean Herbert
4ecc690164
Merge branch 'master' into fix-logo-vis-catchup 2019-07-04 00:47:42 +09:00
Dean Herbert
ead961004a
Update framework (#5231)
Update framework
2019-07-04 00:47:27 +09:00
Dean Herbert
db3e9c7e60
Fix WaveOverlayContainer being always present (#5210)
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +09:00
Dean Herbert
1824d29996 Update framework 2019-07-04 00:34:39 +09:00
Dean Herbert
127b0b33c2
Fix local beatmap leaderboard displaying scores from all game m… (#5226)
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 21:52:44 +09:00
Andrei Zavatski
cfac90b228 Use ConstrainedIconContainer instead of SpriteIcon 2019-07-03 14:34:24 +03: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
3b5ffdc2cb
Merge branch 'master' into android 2019-07-03 19:05:58 +09:00
Dean Herbert
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00