1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 04:37:51 +08:00
Commit Graph

21365 Commits

Author SHA1 Message Date
DTSDAO
0f1dd8a46e Undo #5533 for causing crashes 2019-07-31 21:44:57 +08:00
iiSaLMaN
3af1aaeabe Unsubscribe from Completed event on old beatmap 2019-07-31 15:19:02 +03:00
Dean Herbert
3a2e0fbba5
Merge pull request #5546 from smoogipoo/score-mod-multipliers
Apply mod multipliers to the score
2019-07-31 18:09:37 +09:00
smoogipoo
e57663b39c Apply mod score multipliers 2019-07-31 17:55:22 +09:00
smoogipoo
6bfac9f8e4 Remove protected ctor 2019-07-31 17:50:13 +09:00
jorolf
e01d3d85a3 Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins 2019-07-30 20:29:04 +02:00
Dean Herbert
8caf9ade01
Add support for legacy skin "cursormiddle" display (#5465)
Add support for legacy skin "cursormiddle" display

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-31 00:26:19 +09:00
Dean Herbert
26909dc580
Update follower count API source (#5397)
Update follower count API source
2019-07-31 00:24:18 +09:00
Dean Herbert
d5a5a866e1
Update framework (#5532)
Update framework
2019-07-31 00:04:02 +09:00
Dean Herbert
9335ebeb55 Fix missing anchor/origin specification 2019-07-30 23:45:55 +09:00
Dean Herbert
f6b6fa9633 Add disappeared null check 2019-07-30 23:44:47 +09:00
Dean Herbert
f9c95e21be Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle 2019-07-30 23:44:13 +09:00
Dean Herbert
067f940b43
Fix slider ball sizing when legacy skin falls back to default (#5466)
Fix slider ball sizing when legacy skin falls back to default
2019-07-30 23:40:43 +09:00
Dean Herbert
091a142c01 Merge remote-tracking branch 'upstream/master' into update-framework 2019-07-30 23:32:58 +09:00
Dean Herbert
4c6cccb3a3 Update settings in line with framework changes 2019-07-30 23:31:21 +09:00
Dean Herbert
21a8f566c3 Trim whitespace 2019-07-30 23:24:28 +09:00
Dean Herbert
d12de7dbfa Add temporary scale hack to make cursors correct size 2019-07-30 23:20:35 +09:00
Dean Herbert
8e9f8bb565
Merge branch 'master' into slider-ball-scaling 2019-07-30 23:19:28 +09:00
Dean Herbert
fbc5285a1f
Add legacy skin hit animations (#5464)
Add legacy skin hit animations
2019-07-30 23:18:12 +09:00
Dean Herbert
557c33611f
Add a basic skin line-up test scene (#5504)
Add a basic skin line-up test scene

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-30 23:08:41 +09:00
Dean Herbert
d661170580
Fix ITMS-90737 (#5533)
Fix ITMS-90737
2019-07-30 23:08:24 +09:00
Dean Herbert
6d279dba5c Fix centering being incorrect for some skins 2019-07-30 23:07:41 +09:00
Dean Herbert
fb1f77bd04 Move implementation and colour logic to legacy implementation 2019-07-30 23:06:18 +09:00
Dean Herbert
e6bd02d276 Simplify namespace definition 2019-07-30 22:41:20 +09:00
Dean Herbert
307a6c1095 Remove DefaultCirclePiece 2019-07-30 22:38:29 +09:00
Dan Balasescu
dae17482fa
Merge branch 'master' into skinning-test 2019-07-30 22:33:39 +09:00
Dean Herbert
e849e68e99 Update framework 2019-07-30 22:24:03 +09:00
Dean Herbert
7cab0fcfb8
Merge branch 'master' into slider-ball-scaling 2019-07-30 22:20:45 +09:00
Dean Herbert
5bb31ecb00
Merge branch 'master' into update-follower-count 2019-07-30 22:20:33 +09:00
Dean Herbert
1fbaa97218
Merge branch 'master' into add-legacy-hit-animations 2019-07-30 22:20:29 +09:00
Dean Herbert
6ded53b3a9 Reorder class 2019-07-30 21:53:28 +09:00
Dean Herbert
1bb918d76f
Merge pull request #5531 from smoogipoo/skin-dropdown-max-height
Add maximum height to settings skin dropdown
2019-07-30 21:46:54 +09:00
DTSDAO
333049e712 Fix ITMS-90737 2019-07-30 19:32:53 +08:00
iiSaLMaN
f2ab259c21 Add an assert if current break index has skipped a break 2019-07-30 13:30:26 +03:00
iiSaLMaN
e6e315e07b Expose current break index 2019-07-30 13:29:41 +03:00
smoogipoo
fab3ec3e5b Add maximum height to skin dropdown 2019-07-30 19:28:02 +09:00
Dean Herbert
de20d02672 Make special skin more generic 2019-07-30 19:11:54 +09:00
smoogipoo
1222536f7a Rename resource string 2019-07-30 19:10:21 +09:00
Dan Balasescu
114c2006c1
Merge branch 'master' into legacy-cursor-middle 2019-07-30 19:06:28 +09:00
Dan Balasescu
1d3d8e192c
Merge pull request #5528 from peppy/no-sentry-timeouts
Don't forward timeout exceptions to sentry
2019-07-30 18:59:49 +09:00
Dean Herbert
eaaef61bc2 Revert unintended change 2019-07-30 18:59:17 +09:00
Dean Herbert
e8e5b2742d Fix manual clock usage 2019-07-30 18:31:57 +09:00
Dan Balasescu
6a66a3b06f
Merge branch 'master' into skinning-test 2019-07-30 18:28:56 +09:00
Dan Balasescu
79f120b381
Merge branch 'master' into no-sentry-timeouts 2019-07-30 18:27:05 +09:00
Dean Herbert
20b6114863 Reduce method complexity 2019-07-30 17:52:06 +09:00
Dean Herbert
80aaa42f99
Move database isolation logic to OsuTestScene for easier reuse (#5502)
Move database isolation logic to OsuTestScene for easier reuse
2019-07-30 14:16:42 +09:00
Dean Herbert
808f77f1b1
Fix version overlay displaying briefly before it should (#5512)
Fix version overlay displaying briefly before it should
2019-07-30 14:10:24 +09:00
Dean Herbert
8950f009e1
Don't report stable storage missing to sentry (#5521)
Don't report stable storage missing to sentry
2019-07-30 14:07:31 +09:00
Dean Herbert
b7ee4b7694
Fix scores without an online ID not always presenting correctly (#5517)
Fix scores without an online ID not always presenting correctly
2019-07-30 14:06:19 +09:00
David Zhao
1956098166 Add a fallback for humanizer localization failure 2019-07-30 14:06:08 +09:00