1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Commit Graph

18167 Commits

Author SHA1 Message Date
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
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
Dean Herbert
febe8b4695
Update with framework DrawNode changes (#4576)
Update with framework DrawNode changes

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-27 21:01:09 +09:00
Dean Herbert
27c1c368ac Remove unused using 2019-04-27 20:42:07 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
Dean Herbert
41d0b00120 Update framework 2019-04-27 16:43:23 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
smoogipoo
32e71a6314 Fix incorrect seeking behaviour of TrackVirtualManual 2019-04-26 16:15:42 +09:00
smoogipoo
50a775145c Separate variables 2019-04-26 13:56:26 +09:00
smoogipoo
2f4bf423a4 Renamespace 2019-04-26 13:51:39 +09:00
smoogipoo
7047303b0f Add tooltips to all buttons 2019-04-26 13:29:58 +09:00
Dean Herbert
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
Dean Herbert
4fade26543
Turn on warnings, resolve issues (#4679)
Turn on warnings, resolve issues
2019-04-26 13:19:54 +09:00
smoogipoo
4adf590036 Combine hover/active state handling in tab control 2019-04-26 12:41:00 +09:00
smoogipoo
d5b91c6455 Cleanup top header container + user handling 2019-04-26 12:32:15 +09:00
smoogipoo
838325fed4 Remove HasTooltipContainer, use separate composites 2019-04-26 11:58:45 +09:00
David Zhao
9ce7d0416b
Fix framework version 2019-04-25 23:16:08 +09:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00