1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 09:22:56 +08:00
Commit Graph

401 Commits

Author SHA1 Message Date
Andrei Zavatski
1e025b7c31 Add tests to cover the issue 2020-03-25 20:58:51 +03:00
Andrei Zavatski
f8169e9712 Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-layout-split 2020-03-21 20:31:38 +03:00
OctopuSSX
157f05c3e5
Update osu.Game/Users/Drawables/DrawableAvatar.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-20 14:35:27 +03:00
OctopuSSX
b813c0aff1
Don't open profile if it's Autoplay 2020-03-20 14:26:26 +03:00
Andrei Zavatski
4ac740b12b Remove APIFriend 2020-03-17 08:51:54 +03:00
Andrei Zavatski
d9d812a8fe Fix status icon flash on first status change 2020-03-17 02:10:20 +03:00
smoogipoo
58fc947be3 Privatise some setters 2020-03-16 14:06:42 +09:00
Andrei Zavatski
e886c155e6 Adjust text size values 2020-03-07 04:05:17 +03:00
Andrei Zavatski
66f40f7f6e Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update 2020-03-07 04:01:36 +03:00
Dean Herbert
8ff3370273 Add a short load delay for avatars to avoid unnecessary fetching 2020-03-06 16:27:38 +09:00
Andrei Zavatski
6b44021f4d Change username text size back to 20 2020-03-05 03:33:14 +03:00
Andrei Zavatski
6b1fdcf9a2 Minor adjustments 2020-03-05 02:38:30 +03:00
Andrei Zavatski
13752ffe9d Revisit UserGridPanel layout 2020-03-05 02:31:19 +03:00
Andrei Zavatski
2e996eeb7e Refactor displayStatus function and add comments 2020-03-05 02:10:38 +03:00
Andrei Zavatski
22d43c26aa Adjust some text values 2020-03-05 02:00:46 +03:00
Andrei Zavatski
06b2c70a04 Simplify alignment setting for status message 2020-03-05 01:45:49 +03:00
Andrei Zavatski
d297bf6957 Adjust background presentation 2020-03-05 01:41:55 +03:00
Andrei Zavatski
0b98bcc856 Fix incorrect click action 2020-03-04 15:22:08 +03:00
Andrei Zavatski
6631b07442 Refactor to replace existing panels 2020-03-04 14:58:15 +03:00
smoogipoo
ffa8a50c6b Make User IEquatable 2020-02-27 19:21:59 +09:00
smoogipoo
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
Andrei Zavatski
2d1afb66fb Add history counts to user api 2020-02-07 16:21:47 +03:00
Andrei Zavatski
a9cfade2f4 Adjust null handling 2020-02-04 21:02:10 +03:00
Andrei Zavatski
f889f2435b Add test step to TestSceneRankingsTable 2020-02-04 16:20:15 +03:00
recapitalverb
2bbd12e39a Fix code formatting 2020-02-04 11:36:22 +07:00
recapitalverb
a8ce50fadd Add FormatUtils.FormatAccuracy and usages 2020-02-04 11:17:23 +07:00
recapitalverb
ddf9317bec Replace :P2 with :0.00% 2020-02-04 08:25:01 +07:00
recapitalverb
257b4052e8 Add {ScoreInfo,UserStatistics}.Accuracy 2020-02-03 22:09:07 +07:00
Revel
443dedfd07 undo menu item capitalization 2020-01-14 14:54:06 -05:00
Revel
a86fb2113e fix tooltip capitalization 2020-01-14 14:26:54 -05:00
Albie Spriddell
d4888c39de cleanup 2020-01-03 15:22:33 +00:00
Albie Spriddell
71a3db7cd6 remove from rulesetinfo 2020-01-03 13:08:01 +00:00
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00: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
Dan Balasescu
3d13fe485d
Merge pull request #7238 from huoyaoyuan/fxcop
Apply FxCop at game side
2019-12-17 21:29:52 +09:00
Andrei Zavatski
023892738a Integration into overlay 2019-12-17 12:36:44 +03:00
Huo Yaoyuan
d5994ed484 CA2208: create exceptions correctly. 2019-12-17 13:00:10 +08:00
Andrei Zavatski
62daea195c Fix possible null 2019-12-01 04:09:45 +03:00
Andrei Zavatski
f375db368f Remove useless null check 2019-12-01 03:56:03 +03:00
Andrei Zavatski
0ac4675546 Implement IEquatable<Country> 2019-12-01 03:52:41 +03:00
Andrei Zavatski
c451542915 Rankings overlay basic implementation 2019-11-30 03:01:07 +03:00
Dean Herbert
7efbf9f38f Merge remote-tracking branch 'upstream/master' into rankings-tables 2019-11-29 15:37:08 +09:00
Dean Herbert
f4f54bc46b Fix social browser calling game-wide load stalls 2019-11-29 13:03:17 +09:00
Andrei Zavatski
c546df8a80 Refactor API logic 2019-11-27 21:56:22 +03:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables 2019-11-27 23:26:54 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Huo Yaoyuan
ca52d09e81 Enforce expression body for typical simple ones. 2019-11-12 19:56:37 +08:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables 2019-11-12 18:59:43 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
ddd58ea3da Use LongRunningLoad on network load components 2019-11-01 19:40:45 +09:00
Andrei Zavatski
5b09daef1a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-10-01 13:54:15 +03:00
Andrei Zavatski
2a395956aa Merge dependencies 2019-09-27 19:00:17 +03:00
Andrei Zavatski
94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
Andrei Zavatski
96453d8197 Remove redundant string interpolation 2019-09-15 02:46:28 +03:00
Andrei Zavatski
babd34470e Fix DrawableFlag returns empty texture if there's no flag avaliable for needed country 2019-09-15 02:33:21 +03:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
Dean Herbert
6d5a7041fd Move system user colour assignment to ensure consistency 2019-08-08 17:10:06 +09:00
Andrei Zavatski
d693a54c84 Move RankHistoryData to User Statistics 2019-08-04 14:35:26 +03:00
Andrei Zavatski
d558758000 Add PreviousUsernames field to the User 2019-08-01 19:14:07 +03:00
Dean Herbert
ddb98c705a
Merge branch 'master' into update-follower-count 2019-07-28 12:53:40 +09:00
Dean Herbert
f175f597e7 Update follower count API source 2019-07-18 14:05:57 +09:00
Joehu
83ffb1d542 Remove unnecessary transforms on top score user section 2019-07-15 14:15:03 -07:00
HoLLy
236d5a9abc Remove leftover TransformDuration overrides 2019-06-24 18:26:25 +02:00
HoLLy
739077ef4f Only hide UpdateableAvatar/Flag immediately 2019-06-24 18:24:31 +02:00
HoLLy
7734c4b41a Fix code style 2019-06-24 18:09:42 +02:00
HoLLy
aed83471f4 Replace Reset with overridden TransformImmediately/TransformDuration 2019-06-24 10:51:45 +02:00
HoLLy
fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
KingLuigi4932
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
iiSaLMaN
4cb9563af2
Use ModelBackedDrawable in UpdateableAvatar 2019-06-17 07:16:38 +03:00
iiSaLMaN
98f8b1d59a
Use ModelBackedDrawable in DrawableFlag 2019-06-17 06:44:24 +03:00
Dan Balasescu
169c18d238
Merge branch 'master' into fix-social-overlay-performance 2019-06-12 20:37:15 +09:00
Dean Herbert
0f000fcc14 Fix abysmal load performance when showing the social overlay 2019-06-12 19:58:26 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
Dean Herbert
20b43c20c8 Rename variables to remove redundant "screen" terminology 2019-06-12 16:33:15 +09:00
Lucas A
51d428ef94 Refactor UserPanel status display logic 2019-06-11 20:00:14 +02:00
Lucas A
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
Lucas A
a819dd764f Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-25 11:02:19 +02:00
Dean Herbert
bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +09:00
Lucas A
2f663622cc Fix CI inspections 2019-05-12 17:40:18 +02:00
Lucas A
55663b3576 Nest all UserActivities into UserActivity 2019-05-12 17:38:02 +02:00
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
Lucas A
a50bbf7f42 Make appveyor happy. 2019-05-05 21:32:23 +02:00
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
Dean Herbert
fe644c6909
Merge branch 'master' into profile_web_changes 2018-04-20 12:51:30 +09:00
tgi74000
64709da546 Update profile header to osu-web changes 2018-04-19 14:46:42 +02:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
jorolf
6ca714d93b add badges to ProfileHeader 2018-04-15 23:49:45 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
9233266fe1 Fix login failure for users with no country rank
Closes #2148.
2018-03-11 00:44:16 +09:00
Dean Herbert
e107566575 Update user object to match new standardised api 2018-02-08 18:06:04 +09:00
Dean Herbert
93c4612f4f Add comment about deserialising helper 2018-02-07 18:18:26 +09:00