Commit Graph

209 Commits

Author SHA1 Message Date
Lucas A 3d8b56fe57 Fix user status related unit tests 2019-05-05 21:11:52 +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 b216635488 Added UserActivity class holding information about the current activity for the local user 2019-05-05 20:07:55 +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
Lucas A 7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02:00
Dean Herbert 8ab5149336 SupporterLevel -> SupportLevel 2019-04-28 20:11:36 +09:00
Dean Herbert fa340a9eff
Merge branch 'master' into profile-header-update 2019-04-27 23:48:23 +09:00
smoogipoo 2f4bf423a4 Renamespace 2019-04-26 13:51:39 +09:00
Lucas A 361c0ec9f2 Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in 2019-04-13 13:18:44 +02:00
Lucas A da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
smoogipoo 772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
jorolf ccc804a9b2 get everything working again 2019-04-04 00:24:42 +02:00
jorolf 5bc6042309 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-03 22:59:27 +02:00
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
jorolf 2525f5bcb7 Apply most suggestions 2019-03-09 23:58:14 +01:00
smoogipoo e3d463a141 Formatting fixes 2019-03-06 19:26:48 +09:00
smoogipoo ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
jorolf 54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown 6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
jorolf 8bab87c072 update resources and remove unused usings 2019-01-04 23:09:21 +01:00
jorolf a33a1458a5 update design and make play styles an enum 2019-01-04 22:52:00 +01:00
jorolf 15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
smoogipoo f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert 716eee9a5c Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
Dean Herbert d801ce7afb
Merge pull request #3318 from cl8n/update-user-api
Update LastVisit JSON property name
2018-10-04 13:56:37 +09:00
Dean Herbert 4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert 0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
Dean Herbert f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert 03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo 1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
clayton e1f01d6f73
Update LastVisit JSON property name 2018-08-25 20:31:33 -07:00
Dean Herbert bbb11a4066 Fix regression in drawable rank first display 2018-07-13 19:53:29 +09:00
Dean Herbert 6ced51bb67
Merge branch 'master' into removeAge 2018-07-09 17:43:23 +09:00
HoutarouOreki 10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
smoogipoo 0a67e5a274 Fix some possible null reference exceptions 2018-07-09 17:09:17 +09:00
Nobbele ad8ba37ee3
Updated UserStatus.cs to make more sense(UNTESTED)
Untested code, on my ipad in school so i can’t compile the code or check for refrences to stuff

Modding, playing multiplayer/singleplayer, Busy, etc are all done when user is online so they may just be a class of type UserStatusOnline(used to be UserStatusAvailable but since available and online are basically the same i just made available be online). I don’t know how PM’s are handled but i assume that the client recieves the PM and then decides what to do based on your status. By doing this you can interupt the user with the message if typeof(status) != typeof(UserStatusBusy), making multiplaying, solo game, etc not interupt the user, but when typeof(status) == typeof(UserStatusBusy) show a less intrusive message box to not interupt the user
2018-04-26 12:57:24 +02:00