Commit Graph

12681 Commits

Author SHA1 Message Date
b54c0176eb Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
49eb8b0b53 Merge branch 'master' into lock-working-cache 2019-07-05 15:14:07 +09:00
df7d31350c Stop import failures from being added to the imported model list 2019-07-05 14:47:55 +09:00
d5a9542743 Fix incorrect xmldoc in DownloadTrackingComposite (#5261)
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
d77d49f595 Merge branch 'master' into fade-music-on-exit 2019-07-05 13:13:07 +09:00
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03:00
d624157c45 Remove unnecessary fading 2019-07-05 05:17:36 +03:00
bff5ad22f4 Check if the locally available score has files 2019-07-05 05:16:40 +03:00
91d461eba7 Merge pull request #5251 from Joehuu/remove-edit-song-select-file
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
38dceddc27 Fix file ordering 2019-07-05 10:07:45 +09:00
037ea7b708 Merge branch 'master' into fix-colour-mod-filter 2019-07-05 10:04:31 +09:00
ae7da2557e Fix initial colour of leaderboard mod filter 2019-07-04 13:24:13 -07:00
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
9b2ebed669 Remove unused EditSongSelect file 2019-07-04 08:36:34 -07:00
32bb963393 Lock WorkingBeatmap cache to avoid threading issues 2019-07-04 14:33:00 +09:00
b53aeec90d Move audio adjustment inside OnResuming 2019-07-04 05:18:29 +03:00
99603ca0b6 Fade out game volume on exiting
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
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
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
e55d6232d1 Merge branch 'master' into direct-ruleset-selector 2019-07-04 00:56:36 +09:00
4ecc690164 Merge branch 'master' into fix-logo-vis-catchup 2019-07-04 00:47:42 +09:00
ead961004a Update framework (#5231)
Update framework
2019-07-04 00:47:27 +09:00
db3e9c7e60 Fix WaveOverlayContainer being always present (#5210)
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +09:00
1824d29996 Update framework 2019-07-04 00:34:39 +09:00
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
cfac90b228 Use ConstrainedIconContainer instead of SpriteIcon 2019-07-03 14:34:24 +03:00
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
3b5ffdc2cb Merge branch 'master' into android 2019-07-03 19:05:58 +09:00
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00
d723998389 Merge remote-tracking branch 'upstream/master' into discoverRulesets 2019-07-03 18:36:37 +09:00
62dd89197c Refactor comment slightly 2019-07-03 18:36:04 +09:00
ccae4ce95e Fix local beatmap leaderboard displaying scores from all game modes 2019-07-03 14:39:11 +05:30
5ecb764cdc Remove whitespaces and lowercase the comments 2019-07-03 10:57:09 +02:00
9805adc61d Fix online ScoreInfo having the wrong ruleset 2019-07-03 14:25:59 +05:30
43d7f66c5b Add comment about the android ruleset situation. 2019-07-03 10:54:10 +02:00
1219bea077 Fix layout of profile top header to match web (#5218)
Fix layout of profile top header to match web
2019-07-03 17:48:18 +09:00
ab244d1b7f Only log that the rulesets could not be loaded from a directory. 2019-07-03 10:21:18 +02:00
d9e646d9ef Use addRuleset inside loadRulesetFromFile 2019-07-03 09:51:09 +02:00
6e308945b1 Fix logo visualisation trying to catch up after being off-screen 2019-07-03 15:22:17 +09:00
1189092e20 Remove redundant scale specification 2019-07-03 12:49:16 +09:00
be904512d9 Merge branch 'master' into animated-rank-grades 2019-07-03 12:44:08 +09:00
d22a1229cb Remove unnecessary disposal 2019-07-03 12:06:20 +09:00
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
466bc7f28a Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
30ec8e031e Merge branch 'master' into animated-rank-grades 2019-07-03 02:34:08 +03:00
a1fb41ea66 Use FillFlowContainer on flag and country 2019-07-02 10:53:52 -07:00
d387629e53 Fix layout of profile top header to match web 2019-07-02 10:52:24 -07:00
a155cdf5fd Merge branch 'master' into fix-overlay-presence 2019-07-03 00:51:22 +09:00
f9c24f2281 Update framework 2019-07-03 00:35:55 +09:00