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

18554 Commits

Author SHA1 Message Date
Dan Balasescu
a1c64d8d26
Merge branch 'master' into fix-retry-sound 2019-05-07 12:40:01 +09:00
Dan Balasescu
14f09ab914
Merge pull request #4719 from smoogipoo/fix-import-crash
Fix beatmap import crashing during room creation
2019-05-07 12:39:53 +09:00
Dan Balasescu
8b9cfadd64
Merge branch 'master' into fix-retry-sound 2019-05-07 12:37:22 +09:00
Dean Herbert
64bc0f958b
Merge branch 'master' into fix-import-crash 2019-05-07 12:18:41 +09:00
smoogipoo
f26a1cff6c Fix beatmap import crashing during room creation 2019-05-07 12:14:57 +09:00
Dan Balasescu
5be8adcfcf
Merge pull request #4703 from peppy/profile-details-animation
Add animation when collapsing or expanding the profile details section
2019-05-07 12:13:59 +09:00
David Zhao
abc163fa36 Fix merge 2019-05-07 12:07:45 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dan Balasescu
9d3f6a716a
Merge branch 'master' into profile-details-animation 2019-05-07 11:44:22 +09:00
Dan Balasescu
437d7a5cf3
Merge pull request #4710 from peppy/skip-matches-stable
Improve skip boundary logic to be closer to expectations
2019-05-07 11:05:14 +09:00
Joehu
8ef6a745f7 Fix slider border not reverting to default color 2019-05-05 22:43:03 -07:00
Dean Herbert
7fdc79dd68 Improve skip boundary logic to be closer to expectations
Supersedes #4693.
Closes #4676.
2019-05-05 20:20:41 +09:00
Dean Herbert
3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
Dean Herbert
b9a39fb788 Fix instant pausing when game becomes inactive
Resolves #4685.
2019-05-04 14:54:29 +09:00
Dean Herbert
0fa0271878 Add animation when collapsing or expanding the profile details section 2019-05-04 11:03:18 +09:00
Dean Herbert
f05471aa18
Fix hidden/expanded centre profile header information (#4696)
Fix hidden/expanded centre profile header information
2019-05-04 11:01:32 +09:00
Joseph Madamba
53accbfce1
Merge branch 'master' into switch-centre-profile-info 2019-05-03 11:27:52 -07:00
Dean Herbert
41ab82cdc3
Merge branch 'master' into refactor-select-footer 2019-05-03 21:46:41 +09:00
LeNitrous
31341bfeb1 use SongSelect's SelectedMods property to ensure it exists 2019-05-03 16:51:33 +08:00
LeNitrous
009eaa647a fixes to FooterButtonRandom 2019-05-03 16:38:15 +08:00
Dan Balasescu
2b57235e0b
Merge pull request #4701 from peppy/fix-mod-equality
Fix mod equality checks not working as intended
2019-05-03 12:08:24 +09:00
Dean Herbert
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +09:00
Joehu
ac31a9640a Add number sign to centre info rankings 2019-05-02 03:47:20 -07:00
Joehu
c6992bd6f9 Switch hidden/expanded centre profile header information 2019-05-02 03:37:15 -07:00
Dean Herbert
bd0704c575
Implement AdjustRank and Hidden mod grades (S+ and SS+) (#4655)
Implement AdjustRank and Hidden mod grades (S+ and SS+)

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-02 14:19:20 +09:00
Dean Herbert
6a4dc5e25c Improve xmldoc slightly 2019-05-02 14:03:58 +09:00
Dean Herbert
1817f7bc12
Merge branch 'master' into sh-xh-grading-2 2019-05-02 13:27:12 +09:00
Dean Herbert
975f6e2c5d
Merge pull request #4694 from peppy/update-framework
Update framework
2019-05-02 13:13:15 +09:00
Dean Herbert
d9e92e12f4
Add number sign in front of profile rankings (#4691)
Add number sign in front of profile rankings

Co-authored-by: jorolf <jorolf@gmx.de>
2019-05-02 12:55:25 +09:00
Dean Herbert
015b5cecb5 Update framework 2019-05-02 12:53:59 +09:00
jorolf
b61807da40
Add number sign inside ToString
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-05-01 17:55:30 -07:00
Joehu
6b7397b9cf Check for null instead of not null 2019-04-30 22:07:06 -07:00
Joehu
9b2d5727cd Fix wrong check 2019-04-30 21:54:25 -07:00
Joehu
1408513ebd Use similar check used on tooltip 2019-04-30 21:51:56 -07:00
Joehu
3cd6ccfc3d Add number sign in front of profile rankings 2019-04-30 20:47:44 -07:00
iiSaLMaN
ddd9262384
fix xmldoc 2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
iiSaLMaN
148f4c4ce0
Pass Rank.Value instead
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
iiSaLMaN
e0abd0b2c1
fix comment 2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment 2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc 2019-04-30 18:12:27 +03:00
Dean Herbert
4201cbf810
Improve waveform graph testing (#4659)
Improve waveform graph testing

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-29 00:14:16 +09:00
Dean Herbert
754bebadbe
Merge branch 'master' into improve-waveform-test 2019-04-28 23:38:24 +09:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound 2019-04-28 23:38:14 +09:00
Dean Herbert
61a09b032d
Profile header update (#3904)
Profile header update

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-04-28 23:37:48 +09:00
Dean Herbert
f9f6e1f04a Clamp values to avoid potentially weird element 2019-04-28 20:13:36 +09:00
Dean Herbert
8ab5149336 SupporterLevel -> SupportLevel 2019-04-28 20:11:36 +09:00
Dean Herbert
27ba89444e Remove unnecessary using statements 2019-04-28 01:08:14 +09:00
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update 2019-04-27 23:48:23 +09:00
Dean Herbert
1e192d08c9
Merge pull request #4674 from peppy/fix-lead-in-issues
Fix lead-in time being too short
2019-04-27 21:14:32 +09:00