1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

20007 Commits

Author SHA1 Message Date
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
Dean Herbert
a26b14a4f8 Move finaliser inside disposal region 2019-07-02 22:21:56 +09:00
Dan Balasescu
15321ee0e8
Merge branch 'master' into reduce-logovis-allocs 2019-07-02 22:44:39 +09:30
Dan Balasescu
ec7495e59d
Merge pull request #5213 from peppy/update-resources
Update menu backgrounds
2019-07-02 22:40:44 +09:30
Dean Herbert
31b1480263
Merge branch 'master' into async-beatmap-load 2019-07-02 20:44:53 +09:00
naoey
1ff6a9d085
Remove unused using 2019-07-02 16:25:40 +05:30
Dean Herbert
f45b42021f Change app label to just "osu!" 2019-07-02 19:55:32 +09:00
Dean Herbert
7dbba87e4c Update dependencies
oops
2019-07-02 19:55:32 +09:00
Dean Herbert
486e7e4e1e Remove unnecessary file 2019-07-02 19:44:04 +09:00
naoey
eaa19d5a49
Remove unused/unnecessary fields 2019-07-02 16:13:47 +05:30
Dean Herbert
9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09:00
Dean Herbert
1a3cc25d6c Update in accordance with visual studio changes
Adds x86 emulator deployment target
2019-07-02 19:40:42 +09:00
miterosan
bc821fcc5d Add native bass libs for x86 Android 2019-07-02 19:39:25 +09:00
Andrei Zavatski
082fa0d808 simplify updateState logic 2019-07-02 13:35:02 +03:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI 2019-07-02 15:55:30 +05:30
Andrei Zavatski
2971bd8cbc Add disable trigger to a testcase 2019-07-02 13:22:38 +03:00
Andrei Zavatski
08dfe413c1 Refactor Ruleset Selector in Direct 2019-07-02 13:07:36 +03:00
Dean Herbert
79b0deb353 Update resources reference 2019-07-02 17:59:25 +09:00
Dean Herbert
587be955c3 Increase number of backgrounds in line with resources 2019-07-02 17:57:23 +09:00
Dean Herbert
7b2227c505 Fix xmldoc 2019-07-02 17:47:19 +09:00
Dean Herbert
6c7b97931e Avoid using a BufferedContainer for backgrounds unless required 2019-07-02 17:45:46 +09:00
Dean Herbert
29bb227de2 Avoid Intro screen holding references to the intro beatmap 2019-07-02 16:28:06 +09:00
Dean Herbert
451765784a Centralise SocialOverlay's scheduling logic
Just some clean-ups to make it easier to confirm correct logic
2019-07-02 15:25:40 +09:00
Dean Herbert
d27a0db45c Enforce StartHidden on relevant overlays 2019-07-02 15:23:47 +09:00