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

30836 Commits

Author SHA1 Message Date
Salman Ahmed
453e1dd48c Merge remote-tracking branch 'upstream/master' into merge-global-to-legacy 2020-07-30 07:10:49 +03:00
Salman Ahmed
6473bf503b Remove use of case when 2020-07-30 07:09:40 +03:00
Dean Herbert
87cf9ff896
Merge pull request #9701 from smoogipoo/fix-tracked-bindable-update-cancellation 2020-07-30 10:21:14 +09:00
Dean Herbert
73a0e58239
Merge pull request #9713 from smoogipoo/mania-judgement-pooling
Add pooling for mania judgements
2020-07-30 10:18:40 +09:00
smoogipoo
5df406a035 Add pooling for mania judgements 2020-07-29 16:41:10 +09:00
Salman Ahmed
5439099b7c Merge GlobalSkinConfiguration settings into the LegacySetting enum 2020-07-29 10:35:51 +03:00
Dan Balasescu
91ce06aaa7
Merge pull request #9710 from EVAST9919/comments-footer
Update comments container footer in line with web
2020-07-29 13:18:45 +09:00
Dean Herbert
2ca3c8a0ff
Merge pull request #9700 from ynjoe/vertical-failing-layer 2020-07-29 12:50:36 +09:00
Andrei Zavatski
d7fab98af0 Update comments container footer in line with web 2020-07-29 06:39:23 +03:00
smoogipoo
4648362214 Safeguard against potential finalise-before-initialised 2020-07-29 11:30:25 +09:00
smoogipoo
a57b6bdc18 Remove cancellation of linked tokens 2020-07-29 11:29:38 +09:00
Dean Herbert
bb2d9bdc7e
Merge pull request #9595 from LiterallyFabian/scaleMod 2020-07-29 10:23:57 +09:00
Dean Herbert
6d39a7a46d
Merge pull request #9702 from smoogipoo/mania-scoring-ratio 2020-07-29 10:22:50 +09:00
Dan Balasescu
3ec659b7b5
Merge pull request #9687 from peppy/fix-gameplay-sample-pausing
Fix looping sounds playing even when paused
2020-07-28 19:24:19 +09:00
Dean Herbert
f97656351d
Merge branch 'master' into scaleMod 2020-07-28 18:55:07 +09:00
Dan Balasescu
bf6cf2144a
Merge pull request #9699 from peppy/fix-autopilow-wind-up
Fix Autopilot mod incompatibility with WindUp/WindDown
2020-07-28 18:49:52 +09:00
Dan Balasescu
ed25b10f8f
Merge branch 'master' into fix-gameplay-sample-pausing 2020-07-28 18:46:15 +09:00
smoogipoo
375dad0878 Increase PERFECT from 320 to 350 score 2020-07-28 17:59:52 +09:00
smoogipoo
f7cd6e83aa Adjust mania scoring to be 95% based on accuracy 2020-07-28 17:58:58 +09:00
smoogipoo
fa25f8aef9 Dispose update scheduler 2020-07-28 17:23:35 +09:00
Dean Herbert
aa0c4f7736
Merge pull request #9604 from peppy/osu-logo-no-update-transforms 2020-07-28 17:11:29 +09:00
Dean Herbert
ca434e82d9 Fix test failures due to gameplay clock not being unpaused 2020-07-28 17:09:38 +09:00
smoogipoo
96f68a3251 Reorder method 2020-07-28 16:53:07 +09:00
smoogipoo
ff3cb6487d Store all linked cancellation tokens 2020-07-28 16:53:07 +09:00
Joe Yuan
e795b1ea31 Failing effect displays vertically 2020-07-28 00:42:48 -07:00
Dan Balasescu
33330701e1
Merge branch 'master' into osu-logo-no-update-transforms 2020-07-28 15:36:37 +09:00
Dan Balasescu
1ff3b20a5e
Merge pull request #9696 from EVAST9919/comments-footer-colours
Comments container visual improvements
2020-07-28 15:36:29 +09:00
Dean Herbert
91c2afe9f1 Merge branch 'master' into fix-gameplay-sample-pausing 2020-07-28 15:10:37 +09:00
Dan Balasescu
5b5ad9bb56
Merge branch 'master' into comments-footer-colours 2020-07-28 15:08:37 +09:00
Dean Herbert
d42a4e943a
Merge pull request #9274 from BananeVolante/Issue#9170 2020-07-28 15:06:23 +09:00
Dean Herbert
3cb1cc0555
Merge branch 'master' into scaleMod 2020-07-28 15:05:35 +09:00
Dean Herbert
d7e4b052fb
Merge branch 'master' into Issue#9170 2020-07-28 14:28:00 +09:00
Dean Herbert
afceab685b
Merge pull request #9688 from peppy/less-spinner-bonus-score
Reduce spinner tick and bonus score
2020-07-28 14:21:48 +09:00
Dean Herbert
72c8f0737e Fix Autopilot mod incompatibility with WindUp/WindDown 2020-07-28 14:18:21 +09:00
Dean Herbert
fec54cc0ad
Merge branch 'master' into Issue#9170 2020-07-28 14:05:13 +09:00
Dean Herbert
ae4d3f712a
Merge pull request #9695 from bdach/hit-lighting-pooling 2020-07-28 14:04:21 +09:00
Dean Herbert
cec07c2e39
Merge pull request #9692 from ppy/dependabot/nuget/SharpCompress-0.26.0
Bump SharpCompress from 0.25.1 to 0.26.0
2020-07-28 13:54:10 +09:00
Dean Herbert
cc0d5d74d7
Merge branch 'master' into Issue#9170 2020-07-28 13:36:42 +09:00
Dan Balasescu
89f2d7d38a
Merge branch 'master' into less-spinner-bonus-score 2020-07-28 13:32:55 +09:00
Dan Balasescu
9aadbd7316
Merge branch 'master' into hit-lighting-pooling 2020-07-28 13:31:03 +09:00
dependabot-preview[bot]
a99c6698b7
Bump SharpCompress from 0.25.1 to 0.26.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.25.1 to 0.26.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25.1...0.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-28 04:25:01 +00:00
Dean Herbert
4248e6a750
Merge pull request #9693 from ppy/dependabot/nuget/Sentry-2.1.5 2020-07-28 13:23:55 +09:00
Dan Balasescu
13b9f65a93
Merge pull request #9697 from peppy/track-virtual-manual-resilience
Fix potential crash due to cross-thread TrackVirtualManual.Stop
2020-07-28 12:36:07 +09:00
Dean Herbert
a210deee9a Remove unnecessary depth setter 2020-07-28 12:16:01 +09:00
Dean Herbert
df3e2cc640 Fix potential crash due to cross-thread TrackVirtualManual.Stop 2020-07-28 12:08:15 +09:00
Dean Herbert
dc577aa6fa Fix display of bonus score 2020-07-28 11:22:58 +09:00
Andrei Zavatski
2d502cebda Update DrawableComment layout 2020-07-28 02:36:25 +03:00
Andrei Zavatski
6737c57e33 Adjust colour of edit info 2020-07-28 01:10:13 +03:00
Andrei Zavatski
69691b3739 Use DrawableDate to represent creation date 2020-07-28 00:53:51 +03:00
Andrei Zavatski
46d1de7fa7 ShowMoreButton rework 2020-07-28 00:43:06 +03:00