1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:02:56 +08:00
Commit Graph

20416 Commits

Author SHA1 Message Date
miterosan
43d7f66c5b Add comment about the android ruleset situation. 2019-07-03 10:54:10 +02:00
Dean Herbert
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
Dean Herbert
7423d0e857 Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-03 17:41:05 +09:00
Dean Herbert
43bdf49277
Implement Hidden mod for osu!catch (#5176)
Implement Hidden mod for osu!catch

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 17:39:08 +09:00
miterosan
ab244d1b7f Only log that the rulesets could not be loaded from a directory. 2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef Use addRuleset inside loadRulesetFromFile 2019-07-03 09:51:09 +02:00
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode 2019-07-03 15:54:34 +09:00
David Zhao
6391d21af1
Remove test used for visualization 2019-07-03 15:54:21 +09:00
Dean Herbert
6e308945b1 Fix logo visualisation trying to catch up after being off-screen 2019-07-03 15:22:17 +09:00
Dean Herbert
299e9c9c33 Update bounty line 2019-07-03 14:34:51 +09:00
Dean Herbert
6c46643c26 Update icon 2019-07-03 14:26:29 +09:00
Dean Herbert
9eef8243c0 Update bounty/contribution information 2019-07-03 14:22:14 +09:00
Dean Herbert
392985a95b
Merge branch 'master' into ctb-hd 2019-07-03 13:29:59 +09:00
Dean Herbert
7c5e4c60c1
Use actual drawables instead of texture in DrawableRank (#5192)
Use actual drawables instead of texture in DrawableRank
2019-07-03 13:01:24 +09:00
Dean Herbert
1189092e20 Remove redundant scale specification 2019-07-03 12:49:16 +09:00
Salman Ahmed
98daaf634a Simplify changes 2019-07-03 06:44:17 +03:00
Dean Herbert
be904512d9
Merge branch 'master' into animated-rank-grades 2019-07-03 12:44:08 +09:00
Dean Herbert
67981a003f
Add ability to download and watch replays (#5189)
Add ability to download and watch replays

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 12:21:13 +09:00
Dean Herbert
d22a1229cb Remove unnecessary disposal 2019-07-03 12:06:20 +09:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
Salman Ahmed
3f39541cc2 Fade health bar on value change 2019-07-03 05:11:11 +03:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes 2019-07-03 07:27:24 +03:00
Salman Ahmed
30ec8e031e
Merge branch 'master' into animated-rank-grades 2019-07-03 02:34:08 +03:00
Joehu
a1fb41ea66 Use FillFlowContainer on flag and country 2019-07-02 10:53:52 -07:00
Joehu
d387629e53 Fix layout of profile top header to match web 2019-07-02 10:52:24 -07:00
Dean Herbert
a155cdf5fd
Merge branch 'master' into fix-overlay-presence 2019-07-03 00:51:22 +09:00
Dean Herbert
a3499a531b
Update framework (#5217)
Update framework
2019-07-03 00:51:06 +09:00
Dean Herbert
f9c24f2281 Update framework 2019-07-03 00:35:55 +09:00
miterosan
f1ceea8361 style fixes 2019-07-02 17:25:12 +02:00
Dean Herbert
e1d0d26669 Add a note about local optimisation that may not be required in the future 2019-07-03 00:21:16 +09:00
miterosan
778c36c7d7 Allow discover of rulesets that are already loaded. 2019-07-02 17:05:04 +02:00
Dean Herbert
2fcd428d73
Merge branch 'master' into fix-overlay-presence 2019-07-02 23:40:49 +09:00
Dean Herbert
6bddee5169
Load beatmap content asynchronously in the background (#5133)
Load beatmap content asynchronously in the background

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 23:37:18 +09:00
Dean Herbert
8e0b5f1622 Fix weird merge conflict 2019-07-02 23:21:13 +09:00
Dan Balasescu
2fafe9a651
Merge branch 'master' into async-beatmap-load 2019-07-02 23:19:10 +09:30
Dean Herbert
7caa6eaed5
Remove all non-transform LogoVisualisation per-frame allocations (#5200)
Remove all non-transform LogoVisualisation per-frame allocations

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:42:18 +09:00
Dean Herbert
51fe8c3ab6
Add database statistics to GlobalStatistics (#5208)
Add database statistics to GlobalStatistics
2019-07-02 22:42:03 +09:00
Dean Herbert
df12090721
Centralise SocialOverlay's scheduling logic (#5209)
Centralise SocialOverlay's scheduling logic
2019-07-02 22:41:49 +09:00
Dean Herbert
73474826f6
Avoid Intro screen holding references to the intro beatmap (#5211)
Avoid Intro screen holding references to the intro beatmap
2019-07-02 22:41:34 +09:00
Dean Herbert
456850f582
Avoid using a BufferedContainer for backgrounds unless required (#5212)
Avoid using a BufferedContainer for backgrounds unless required
2019-07-02 22:41:24 +09:00
Dean Herbert
8d2cb51b8c
Merge branch 'master' into buffer-on-demand 2019-07-02 22:41:17 +09:00
Dean Herbert
089eadb008
Add weak WorkingBeatmap cache (#5163)
Add weak WorkingBeatmap cache

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:40:47 +09:00
Dean Herbert
e7a7f2f660 Add statistic for count of alive WorkingBeatmaps 2019-07-02 22:39:49 +09:00
Dean Herbert
256a1a4309 Merge remote-tracking branch 'upstream/master' into fix-overlay-presence 2019-07-02 22:33:38 +09:00
Dean Herbert
93511266e5 Fix waves not displaying at all 2019-07-02 22:33:33 +09:00
Dean Herbert
f31d840c13 Dispose previous WorkingBeatmap on change 2019-07-02 22:26:08 +09:00
Dean Herbert
9e33fb35e9 Fix typo 2019-07-02 22:26:08 +09:00
Dean Herbert
a6acc1f99f Catch exception and return null for safety
.
2019-07-02 22:26:08 +09:00
Dean Herbert
0b66f13902 Add todo about beatmap load cancellation 2019-07-02 22:22:33 +09:00