1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 22:12:58 +08:00
Commit Graph

26894 Commits

Author SHA1 Message Date
Dean Herbert
e25e9b6164 Merge branch 'master' into multiplayer-header-background 2020-02-20 18:04:02 +09:00
Dean Herbert
a11862ba0d Improve transition between multiplayer screens (and share constants) 2020-02-20 18:03:53 +09:00
Dean Herbert
927115a085
Merge branch 'master' into room-inspector-redesign 2020-02-20 17:41:16 +09:00
Dean Herbert
627ee50f3d
Merge pull request #7899 from smoogipoo/overlined-display-refactor
Refactor overlined displays to support different sizing modes
2020-02-20 17:40:21 +09:00
Dean Herbert
e48166858c
Merge branch 'master' into overlined-display-refactor 2020-02-20 17:38:04 +09:00
Dean Herbert
d82258ede6
Merge branch 'master' into catch-fruit-skinning 2020-02-20 17:26:07 +09:00
Dean Herbert
3cbaf6ebbc
Merge pull request #7898 from peppy/catch-fix-cycle-rate
Fix osu!catch not cycling fruit as often as it should be
2020-02-20 17:25:52 +09:00
Dean Herbert
8c8e756149
Merge pull request #7896 from peppy/combo-colour-independence
Move DrawableHitObject accent colour update duties to ruleset
2020-02-20 17:01:58 +09:00
Dean Herbert
5c16dbbea9
Merge pull request #7919 from smoogipoo/null-leaderboard-position
Support null leaderboard position
2020-02-20 16:27:24 +09:00
Dan Balasescu
33382a7a41
Merge branch 'master' into catch-fix-cycle-rate 2020-02-20 16:17:24 +09:00
Dan Balasescu
6759310d2a
Merge branch 'master' into combo-colour-independence 2020-02-20 16:17:12 +09:00
Dan Balasescu
ae86fa367c
Merge pull request #7897 from peppy/fix-index-transfer
Fix indices in beatmap not being transferred to children
2020-02-20 16:16:42 +09:00
Dean Herbert
049975b5a4 Use kebaberize shorthand 2020-02-20 15:45:54 +09:00
Dean Herbert
8f5d3896f6 Remove unnecessary cast by changing method siganture 2020-02-20 15:45:47 +09:00
Dean Herbert
5551343cf3 Throw instead of null return 2020-02-20 15:45:25 +09:00
Dean Herbert
2869128e11 Update in line with combo colour API changes 2020-02-20 15:41:57 +09:00
Dean Herbert
f593bc8d9e Merge branch 'combo-colour-independence' into catch-fruit-skinning 2020-02-20 15:31:43 +09:00
Dean Herbert
337a7986cf Fix reference in test scene 2020-02-20 15:19:12 +09:00
Dean Herbert
5970c102b4 Change API to be easier to understand 2020-02-20 15:17:49 +09:00
Dean Herbert
5aea599c5e Merge branch 'master' into combo-colour-independence 2020-02-20 15:05:15 +09:00
smoogipoo
d79ca97fe9 Make beatmap scores also support null position 2020-02-20 15:04:12 +09:00
Dan Balasescu
eb8a56055f
Merge pull request #7910 from EVAST9919/rankings-clickable-countries
Make country names in RankingsOverlay clickable
2020-02-20 15:00:01 +09:00
Dan Balasescu
e20ddc2aed
Merge branch 'master' into fix-index-transfer 2020-02-20 14:54:21 +09:00
Dan Balasescu
474d0635cf
Merge pull request #7913 from TheWildTree/highlight-full-combo
Highlight max combo on beatmap leaderboards
2020-02-20 14:53:55 +09:00
smoogipoo
1a689231c2 Support null leaderboard position 2020-02-20 14:51:25 +09:00
smoogipoo
177935d644 Remove unused using 2020-02-20 14:45:35 +09:00
Dean Herbert
0cf0099fd5
Merge pull request #7917 from smoogipoo/fix-drawableroom-async-test
Fix possible test failures due to async loads
2020-02-20 14:37:51 +09:00
smoogipoo
c5fd969568 Fix 0 size in test scene 2020-02-20 14:33:13 +09:00
smoogipoo
17b669fdf7 Refactor to detail the sizing mode setting 2020-02-20 14:32:16 +09:00
Dan Balasescu
51f03d0f07
Adjust comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-20 14:28:38 +09:00
Dan Balasescu
bf5c34a014
Merge branch 'master' into rankings-clickable-countries 2020-02-20 14:21:44 +09:00
Dean Herbert
bcddd5f2da
Merge pull request #7918 from peppy/add-old-bananas
Add missing test banana resources
2020-02-20 14:17:04 +09:00
Dan Balasescu
31612369c2
Merge pull request #7912 from EVAST9919/new-direct-gen-three
Implement BeatmapListingOverlay
2020-02-20 14:10:29 +09:00
Dan Balasescu
ae12097a46
Merge branch 'master' into highlight-full-combo 2020-02-20 14:02:24 +09:00
Dan Balasescu
45a5957ad7
Merge branch 'master' into fix-index-transfer 2020-02-20 13:55:48 +09:00
Dan Balasescu
d9023594e6
Merge branch 'master' into add-old-bananas 2020-02-20 13:55:46 +09:00
smoogipoo
00d8be9235 Adjust height transition 2020-02-20 13:48:34 +09:00
Andrei Zavatski
1935a14288 Adjust animations to be much smoother 2020-02-20 05:08:42 +03:00
Dean Herbert
907c1b3d1c Add missing test banana resources 2020-02-20 10:48:12 +09:00
Andrei Zavatski
a8c735b66d Change default category value 2020-02-20 04:19:50 +03:00
Andrei Zavatski
5d8445676d Merge remote-tracking branch 'refs/remotes/ppy/master' into new-direct-gen-three 2020-02-20 04:15:09 +03:00
Dean Herbert
128a9cf075
Merge branch 'master' into fix-drawableroom-async-test 2020-02-20 09:07:48 +09:00
Dean Herbert
a890afcac2
Merge pull request #7875 from smoogipoo/fix-async-playlist-enumeration
Fix music playlist being enumerated asynchronously
2020-02-20 09:06:28 +09:00
Andrei Zavatski
66ea794935 Add debounce to the querying 2020-02-20 02:54:35 +03:00
Andrei Zavatski
7550685a61 DrawableErrorHandler -> NotFoundDrawable 2020-02-20 02:43:13 +03:00
smoogipoo
b2d9004212 Fix possible test failures due to async loads 2020-02-20 08:37:23 +09:00
TheWildTree
84d6a8ae2a Add null check 2020-02-19 19:42:56 +01:00
TheWildTree
7ea67aa672 Highlight max combo on beatmap leaderboards 2020-02-19 17:58:59 +01:00
TheWildTree
23c9782f50 Add maxCombo to APIBeatmap 2020-02-19 17:58:41 +01:00
TheWildTree
62227ad856 Add MaxCombo to BeatmapInfo 2020-02-19 17:58:10 +01:00