1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 14:12:54 +08:00
Commit Graph

21390 Commits

Author SHA1 Message Date
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
Dean Herbert
d5938d3f7c
Fix right mouse drag at song select seeking incorrectly with ma… (#5518)
Fix right mouse drag at song select seeking incorrectly with many beatmaps loaded

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-30 14:06:02 +09:00
Dean Herbert
6f91a21f00 Use switch 2019-07-30 13:31:57 +09:00
Dean Herbert
370a81d78a Don't forward timeout exceptions to sentry 2019-07-30 13:30:26 +09:00
Dan Balasescu
5add719e6e
Merge branch 'master' into fix-right-mouse-drag-large-view 2019-07-30 12:51:12 +09:00
Dean Herbert
a16c0f2aa0 Don't report stable storage msising to sentry 2019-07-30 12:44:08 +09:00
Salman Ahmed
c8b7cf8672
Merge branch 'master' into add-bindable-for-break-times 2019-07-30 06:23:47 +03:00
Dan Balasescu
eeddadef54
Merge pull request #5519 from peppy/fix-tournament-tests
Fix tournament tests not running
2019-07-30 11:48:38 +09:00
Dean Herbert
4ee20bae30 Merge branch 'master' into slider-ball-scaling 2019-07-30 07:54:40 +09:00
Dean Herbert
1d1372d639 Remove forceful resizing 2019-07-30 07:42:19 +09:00
Dean Herbert
62f6958165 Fix tournament tests not running 2019-07-30 07:23:25 +09:00
Dean Herbert
cec26a270e Fix using right mouse button to drag at song select seeking incorrectly with many beatmaps loaded
Closes #5195
2019-07-30 07:04:16 +09:00
Dean Herbert
ece5a9622e Fix scores without an online ID not always presenting correctly 2019-07-30 06:32:05 +09:00
Dean Herbert
f21a2f7e5e Fix version overlay displaying briefly before it should 2019-07-29 21:49:12 +09:00
Dean Herbert
5fa820cdd4
Update framework (#5511)
Update framework
2019-07-29 21:10:40 +09:00
Dean Herbert
b4bcdb1c70 Update framework 2019-07-29 19:44:58 +09:00
Dean Herbert
2401d6fcee
Recalculate path size when path radius changes (#5509)
Recalculate path size when path radius changes
2019-07-29 19:36:14 +09:00
Dean Herbert
31c8c0f75a
Fix legacy scores with no online ID being imported with a non-n… (#5508)
Fix legacy scores with no online ID being imported with a non-null ID
2019-07-29 19:21:00 +09:00
smoogipoo
c01461b951 Recalculate path size when path radius changes 2019-07-29 19:12:41 +09:00
Dean Herbert
766cf9295d Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations 2019-07-29 19:03:36 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence (#5275)
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
Dan Balasescu
ef229c0f80
Merge branch 'master' into legacy-cursor-middle 2019-07-29 18:52:11 +09:00
jorolf
0635680db5 fix some code quality 2019-07-29 11:49:59 +02:00
Dean Herbert
894d573fbc
Cache DrawableHitObject for skinnables to access (#5463)
Cache DrawableHitObject for skinnables to access
2019-07-29 18:49:37 +09:00
Dean Herbert
a4f30daf13
Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
Dean Herbert
d99408e979
Fix SkinChanged events triggering after disposal (#5461)
Fix SkinChanged events triggering after disposal

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-29 18:48:53 +09:00