1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
Commit Graph

24691 Commits

Author SHA1 Message Date
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
Dean Herbert
5cdc7d3b18
Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
Add initial implementation of a legacy beatmap encoder
2019-12-18 18:43:14 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
Dean Herbert
06287f72f3
Merge pull request #7221 from LeNitrous/nightcore-beats
Implement backing beats for Nightcore mods
2019-12-18 18:28:16 +09:00
Dean Herbert
4ff5310473
Fix editor crashing when loading a beatmap for an unsupported r… (#7261)
Fix editor crashing when loading a beatmap for an unsupported ruleset
2019-12-18 18:16:07 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings 2019-12-18 17:59:27 +09:00
Dean Herbert
1f3e1b3085 Remove unused using 2019-12-18 17:59:07 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
smoogipoo
d65e37d795 Fix typo 2019-12-18 17:58:29 +09:00
Dean Herbert
bf85f4affb Fix editor crashing when loading a beatmap for an unsupported ruleset 2019-12-18 17:53:26 +09:00
Dean Herbert
69f888fc49
Fix storyboard flipping potentially not having an effect (#7260)
Fix storyboard flipping potentially not having an effect
2019-12-18 17:48:41 +09:00
Dean Herbert
53d6693c89
Fix storyboard vectorscale and scale cross-polluting each other (#7259)
Fix storyboard vectorscale and scale cross-polluting each other
2019-12-18 17:41:55 +09:00
smoogipoo
8e651962c7 Fix incorrectly binding inside BDL load() 2019-12-18 17:41:30 +09:00
Dean Herbert
4befabc257 Split out complex method 2019-12-18 17:35:51 +09:00
smoogipoo
5aca523d35 Fix storyboard flipping potentially not having an effect 2019-12-18 17:27:13 +09:00
smoogipoo
602ce698d5 Fix storyboard vectorscale and scale cross-pollution 2019-12-18 17:21:38 +09:00
Dean Herbert
fa067b8799
Merge branch 'master' into legacy-beatmap-saving 2019-12-18 17:17:03 +09:00
Dean Herbert
ada2ae2b2c Use tuple to avoid potential for incorrect display 2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf Don't clone beatmap unnecessarily 2019-12-18 17:00:35 +09:00
Dean Herbert
54572b6de9 Update selected mdos references 2019-12-18 16:42:18 +09:00
Dean Herbert
f150d22eaf
Fix SPM calculation logic not handling paused clocks (#7253)
Fix SPM calculation logic not handling paused clocks

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-18 16:30:18 +09:00
Dean Herbert
7831e6ed33
Implement NewsArticleCover class (#7192)
Implement NewsArticleCover class
2019-12-18 16:15:23 +09:00
Dean Herbert
0ca241287c
Implement legacy slider border shadow (#7255)
Implement legacy slider border shadow

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-18 16:09:34 +09:00
Dean Herbert
d4a4efb734 Tidy up test 2019-12-18 16:07:14 +09:00
Dean Herbert
bccde25507 Merge remote-tracking branch 'upstream/master' into legacy-slider-shadow 2019-12-18 15:39:54 +09:00
Dean Herbert
826b271371 Use exact ratio of legacy to default object size 2019-12-18 15:39:36 +09:00
Dean Herbert
0075cb39f8
Add Discord Rich Presence support (#4654)
Add Discord Rich Presence support

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-18 14:53:52 +09:00
Dean Herbert
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +09:00
Dean Herbert
0710e5ba13 Rename unknown mode assets (discord dev page broken) 2019-12-18 14:35:18 +09:00
Dean Herbert
b65847b0d7 Refactor / rewrite discord code 2019-12-18 14:07:53 +09:00
Dean Herbert
0a3d339dd9 Load discord RPC asynchronously 2019-12-18 14:07:32 +09:00
Dean Herbert
f53fd6e4bc Fix status capitalisation 2019-12-18 14:07:21 +09:00
Dean Herbert
2f5b27e97c Make user bindables readonly 2019-12-18 14:07:12 +09:00
Dean Herbert
756d847ad8 Fix user not getting an initial status 2019-12-18 14:07:03 +09:00
smoogipoo
1fe0e45a9c Implement legacy slider border shadow 2019-12-18 13:37:37 +09:00
Dean Herbert
0f5ef78b69 Update client id 2019-12-18 12:39:50 +09:00
Dean Herbert
72acce77b3
Merge branch 'master' into discord-rich-presence 2019-12-18 12:19:54 +09:00
smoogipoo
df8f8ffd0d Fix potential exception during removal 2019-12-18 12:03:15 +09:00
Salman Ahmed
f359a79b7e Add test ensuring correct SPM calculation on rewinding 2019-12-18 03:08:05 +03:00
Salman Ahmed
12a02cf6d9 Extend spinner duration a bit
To allow the times sought to be in the spinner time range
2019-12-18 03:07:06 +03:00
Salman Ahmed
cbfbbf9999 Make SpmCounter public 2019-12-18 03:04:37 +03:00
Salman Ahmed
7e58b4a948 Early-return on potential division by zero in SPM calculation 2019-12-18 03:03:12 +03:00
Lucas A
ad7923f9b9 Fix test methods not being renamed. 2019-12-17 19:25:17 +01:00
Lucas A
0a278ef943 Apply review suggestions 2019-12-17 19:23:30 +01:00
smoogipoo
bcc19e29f2 Fix editor crashing after re-ordering objects 2019-12-18 02:56:29 +09:00
Dean Herbert
b841b78cad
Fix first sample point being treated as redundant (#7182)
Fix first sample point being treated as redundant
2019-12-18 02:15:52 +09:00
Dean Herbert
036efb9947
Merge branch 'master' into fix-effect-points 2019-12-18 01:43:15 +09:00
Dean Herbert
98f4e345ab
Merge pull request #7239 from smoogipoo/fix-local-score-availability
Fix downloaded scores not marked as locally available
2019-12-18 01:40:29 +09:00
Dean Herbert
886db8eb22
Merge branch 'master' into fix-local-score-availability 2019-12-18 01:15:20 +09:00
Dean Herbert
726abaddc3
Implement legacy slider body for classic skins (#7243)
Implement legacy slider body for classic skins

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-18 01:15:00 +09:00