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

11503 Commits

Author SHA1 Message Date
Lucas A
3d8b56fe57 Fix user status related unit tests 2019-05-05 21:11:52 +02:00
Lucas A
d5d31282e5 Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes 2019-05-05 20:55:42 +02:00
Lucas A
88b8afbb6a Make UserPanel show current user activity when
user status is online.
2019-05-05 20:51:55 +02:00
Lucas A
fa986bb5e9 Rework OsuScreen user activity logic 2019-05-05 20:26:56 +02:00
Lucas A
b216635488 Added UserActivity class holding information about the current activity for the local user 2019-05-05 20:07:55 +02:00
Lucas A
a4a2ce5ec0 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886 Split out setUserStatus() logic to multiple lines. +
Make UserStatusDoNotDisturb inherit from UserStatus
2019-05-02 19:44:07 +02: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
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
Lucas A
a3541339f5 Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay 2019-04-30 21:40:44 +02: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
Lucas A
7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02: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
db75516e79
Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +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
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
KingLuigi4932
619071b7ee Unnecessary 'using' directive 2019-04-25 14:23:00 +03:00
smoogipoo
f8c5ee457b Reduce tabcontrol spacing 2019-04-25 20:09:42 +09:00
smoogipoo
8329e53b6c Remove extra space from header title 2019-04-25 20:08:14 +09:00
smoogipoo
2caea38f8c Cleanup centre header container 2019-04-25 20:05:59 +09:00
KingLuigi4932
4e0f21102b Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2 2019-04-25 14:04:12 +03:00
iiSaLMaN
45d9f42c98
Merge branch 'master' into sh-xh-grading-2 2019-04-25 14:01:38 +03:00
KingLuigi4932
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
smoogipoo
9d5b81165e Adjust button stylings 2019-04-25 19:51:05 +09:00
smoogipoo
0eca9b9683 Center -> centre 2019-04-25 18:43:29 +09:00