1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

386 Commits

Author SHA1 Message Date
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
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
Dean Herbert
20c00720e5 Fix formatting 2018-02-07 17:18:38 +09:00
tgi74000
bcd568e607 Check for possible null ranks 2018-02-06 23:00:52 +01:00
tgi74000
d86ce816c7 Add support for country rank 2018-02-06 21:40:52 +01:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Aergwyn
312f52072b enable query
change Avatar animation too
add forgotten usings
2018-01-10 16:46:55 +01:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Aergwyn
bf64b8fc69 added hover effects to panels in social
at least partially QQ
2018-01-04 11:42:50 +01:00
Aergwyn
d0c9d71ee7 fix covers not showing in user panels 2018-01-04 08:15:11 +01:00
Aergwyn
f7fe083018 add tooltip to country flags 2017-12-30 14:59:35 +01:00
Aergwyn
bb4b5bebf9 fix supporter icon in profile missing its background
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
Dean Herbert
49ce42d90c Add ToString() overrides on many classes to make debugging easier 2017-12-16 16:14:01 +09:00
FreezyLemon
856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
9db6ef6657 Fix unfixed regressions 2017-11-23 20:23:47 +09:00
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
FreezyLemon
d6f532171b Implementation fix (since the default delay is now 500 and not 0 this is necessary to ensure the same functionality) 2017-11-23 09:11:52 +01:00
FreezyLemon
7d428875b8 Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor) 2017-11-22 15:46:04 +01:00
FreezyLemon
2203a84300 Small fixes and style corrections 2017-11-21 19:16:44 +01:00
FreezyLemon
fd7ac9b6fc Switched to the new LoadWrapper class for asynchronous loading (LoadComponentAsync not used here since it's not possible to call that method on a component that has not finished loading, and we're in the constructor where it would be called) 2017-11-21 16:18:32 +01:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
EVAST9919
d301ad1435 Add supporter icon to the user panel 2017-11-16 20:06:49 +03:00
Miterosan
e430256b09 User and colors can not be null in UserPanel.cs 2017-11-07 22:51:06 +01:00
Miterosan
2518b5e9a0 Textures in UserCoverBackground.cs can not be null 2017-11-07 22:50:45 +01:00
Miterosan
d5b275fa53 The TextureStore in Country.cs can noit be null. 2017-11-07 22:50:00 +01:00
Miterosan
e417eceb98 Texture in Avatar.cs can not be null. 2017-11-07 22:49:32 +01:00
Dean Herbert
23a729c83a Make avatars use a delayed load wrapper 2017-10-30 19:39:23 +09:00
Dan Balasescu
77d2b1e478 Merge branch 'master' into more_context_menus 2017-09-14 19:21:29 +09:00
Dean Herbert
7cd6caacaa Update to support newer return structure from osu-web API 2017-09-14 18:08:12 +09:00
Dean Herbert
b7c9819680 Add context menus to chat names and user panels 2017-09-14 15:43:47 +09:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
Dean Herbert
7681d97f10 Fix typo in user profile header
Replays watched, not replay watched.
2017-09-13 15:21:04 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Nabile Rahmani
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Dean Herbert
03e4b2a599 Add default status colour 2017-07-13 14:55:19 +09:00
Dean Herbert
d1a5a042d7 Avoid storing locals in UserPanel.
Also make clickable region more correct.
2017-07-13 14:34:51 +09:00
DrabWeb
202e3ca530 Merge https://github.com/ppy/osu into medal-splash 2017-07-11 02:00:36 -03:00
Huo Yaoyuan
6f2b49dea8 Merge branch 'master' into profile. 2017-07-10 10:36:23 +08:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Huo Yaoyuan
cad594018f Add dummy data in test case. 2017-06-26 00:43:32 +08:00
Huo Yaoyuan
bfa275ad1c Change some small classes to struct to avoid potential null check. 2017-06-25 10:51:54 +08:00
DrabWeb
0133f9c086 Medal sprite, make MedalOverlay auto-show when loaded. 2017-06-24 01:19:44 -03:00
DrabWeb
e09625e49d Merge https://github.com/ppy/osu into medal-splash 2017-06-23 22:42:36 -03:00
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
Dean Herbert
89986e8e77 Fix namespaces 2017-06-21 17:03:47 +09:00
Dean Herbert
45d3c2cd52 Merge branch 'master' into profile 2017-06-21 16:40:17 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Huo Yaoyuan
fe3cbb7072 Update join date definition. 2017-06-16 20:32:11 +08:00
Huo Yaoyuan
6372cd0a13 Move namespace under Overlays. 2017-06-16 16:36:23 +08:00
Huo Yaoyuan
3883f4a746 Show profile when click on user panel. 2017-06-16 16:23:20 +08:00
Huo Yaoyuan
bd49ae622a Add color bar and supporter tag. 2017-06-16 15:55:51 +08:00
Huo Yaoyuan
a08d35ec4c Update some container structure. 2017-06-16 15:01:09 +08:00
Huo Yaoyuan
fa98cfa9e5 Handle max==min in LineGraph. 2017-06-16 14:48:14 +08:00
Huo Yaoyuan
9e3935a732 Show available information in RankChart. 2017-06-16 14:34:08 +08:00
Huo Yaoyuan
6967fb1105 Fill user informations. 2017-06-16 14:11:22 +08:00
Huo Yaoyuan
a7e3157363 Fill statistic area. 2017-06-16 01:04:20 +08:00
Huo Yaoyuan
9a77332063 Order sections. 2017-06-15 23:47:56 +08:00
Huo Yaoyuan
2770ccb782 Possible null fields. 2017-06-15 23:46:05 +08:00
Huo Yaoyuan
f03530cdd2 Fetch latest user data. 2017-06-15 22:33:08 +08:00
Huo Yaoyuan
273e2b4a3c Fill more json fields. 2017-06-15 22:09:53 +08:00
Huo Yaoyuan
13d9f3b9bb Move namespace and setup for DI. 2017-06-15 17:53:12 +08:00
Huo Yaoyuan
74f503874f Move some sizes as consts. 2017-06-15 16:57:34 +08:00
Huo Yaoyuan
1e0653eff9 Add SS as an acronym. 2017-06-15 09:10:23 +08:00
Huo Yaoyuan
0c9ccaec95 Move placeholder data into load method. 2017-06-15 08:27:02 +08:00
Huo Yaoyuan
4c8658980b Remove unused user instance for now. 2017-06-15 08:00:15 +08:00
Huo Yaoyuan
b37c3f8ce1 Some CI fixes. 2017-06-15 07:58:20 +08:00
Huo Yaoyuan
1737b59d37 Slightly update some sizes. 2017-06-15 07:23:30 +08:00
Huo Yaoyuan
78669a5941 Hover for rank history. 2017-06-15 02:17:48 +08:00
Huo Yaoyuan
53ad7bc8ca Add RankChart. 2017-06-15 00:48:01 +08:00
Huo Yaoyuan
43542fa5b4 Slightly update design to follow web page. 2017-06-14 20:39:58 +08:00
Huo Yaoyuan
adb4ee8095 Grade badges. 2017-06-14 14:35:47 +08:00
Huo Yaoyuan
c35a3e6999 Level badge and score region. 2017-06-14 12:55:01 +08:00
Huo Yaoyuan
3821360942 Follow web design more. 2017-06-13 19:43:56 +08:00
Huo Yaoyuan
a1c3a456fb Add placeholder text in profile header. 2017-06-13 03:31:17 +08:00
Huo Yaoyuan
53da671b60 Update framework type. 2017-06-12 14:42:14 +08:00
Huo Yaoyuan
e311ac612c Merge branch 'master' into profile 2017-06-12 14:40:42 +08:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
Huo Yaoyuan
798d8711b8 Refactor SectionsContainer to generic. 2017-06-09 16:24:19 +08:00
Huo Yaoyuan
c60ef2449f Fix initial scroll. 2017-06-09 16:05:05 +08:00
Huo Yaoyuan
140c74cd2a Use PageTabControl. 2017-06-09 16:01:16 +08:00
Huo Yaoyuan
51107acdff Improve section behaviour. 2017-06-09 15:22:07 +08:00
Huo Yaoyuan
8dce52e6a8 Fix incorrect class name. 2017-06-09 14:53:30 +08:00
Huo Yaoyuan
5a0bd3b695 Set content in profile sections. 2017-06-09 14:53:00 +08:00
Huo Yaoyuan
c31dd7a480 Set position and color for tab control. 2017-06-09 14:25:23 +08:00
Huo Yaoyuan
283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
Huo Yaoyuan
e3cdb9f6fe Create section classes. 2017-06-07 22:53:31 +08:00
Huo Yaoyuan
e94d98fa84 Expose header background for SectionsContainer. 2017-06-07 22:11:38 +08:00
Huo Yaoyuan
9f9107b847 Add gray background. 2017-06-07 21:15:43 +08:00
Huo Yaoyuan
a09d873db9 Basic member of profile header. 2017-06-06 12:12:20 +08:00
Huo Yaoyuan
428b44f7d9 UserPage -> Profile. 2017-06-05 21:07:57 +08:00
Huo Yaoyuan
1b8ef3bbbd Add test case for UserPage. 2017-06-05 21:05:01 +08:00
DrabWeb
212b2c1142 Initial layout and animation 2017-06-01 04:45:46 -03:00
DrabWeb
3aa1f35127 Basic layout 2017-05-30 05:12:11 -03:00
Huo Yaoyuan
159e8d84c2 Move namespace and make cover background public. 2017-05-27 23:37:15 +08:00
Dean Herbert
d7fa6933be Fix potential nullref 2017-05-25 16:33:58 +09:00
DrabWeb
ec3c92fc3c Trim whitespace 2017-05-24 22:26:48 -03:00
DrabWeb
efd4c57431 Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem 2017-05-24 21:09:18 -03:00
DrabWeb
ca6a9b1b71 Inline cover 2017-05-24 04:21:34 -03:00
DrabWeb
a7914dc1e8 Convert transition_duration to const 2017-05-24 04:00:39 -03:00
DrabWeb
7c6540b008 Cleanup status transition code 2017-05-24 03:49:06 -03:00
DrabWeb
2be1b00a76 Hide status bar when Status is null 2017-05-24 00:45:56 -03:00
DrabWeb
247d8e9b21 Replace "Connected as _" in login form with a UserPanel 2017-05-24 00:23:48 -03:00
DrabWeb
4681beab5d CI fixes 2017-05-22 13:22:14 -03:00
DrabWeb
8b505a9e8b Remove tab character 2017-05-22 13:06:52 -03:00
DrabWeb
261ea4c176 CoverBackgroundSprite for actually async cover loading 2017-05-22 12:41:59 -03:00
DrabWeb
35814e47e4 Colour -> GetAppropriateColour, adjust status change transition 2017-05-22 12:37:19 -03:00
DrabWeb
8a364c6068 CI fixes 2017-05-22 03:37:36 -03:00
DrabWeb
aa40f88258 Add UserStatusOffline 2017-05-22 03:32:02 -03:00
DrabWeb
a73cf92994 Add second UserPanel to visual test, center cover sprite 2017-05-22 03:27:08 -03:00
DrabWeb
7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03:00
smoogipooo
f1f7a26dbd Fix incorrect inheritance. 2017-05-02 17:58:59 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dean Herbert
c7411c47d6
Update User API stuff. 2017-04-20 19:51:28 +09:00
Dean Herbert
3e48a57e9a Merge branch 'master' into score-statistics 2017-04-19 20:36:14 +09:00
Dean Herbert
83fa143e17
Bring API request structure up-to-date. 2017-04-19 16:05:06 +09:00
Dean Herbert
77dbbe6f34
Add a placeholder cover URL for users. 2017-04-18 22:22:14 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
Dean Herbert
f690e1d0c4
Move async logic to framework. 2017-03-28 14:24:34 +09:00
Dean Herbert
36af868f44
Add missing licence header. 2017-03-28 00:13:38 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
039f4a65dc
Combine user models. 2017-03-28 00:08:24 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
bee7b43a37
Make avatar fallback work on failed load. 2017-03-22 09:20:37 +09:00
DrabWeb
5c645350f9 Formatting 2017-03-19 00:14:23 -03:00
DrabWeb
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
DrabWeb
82c02fa1fc Formatting 2017-03-17 18:29:55 -03:00
DrabWeb
0834b5b794 Made requested changes 2017-03-17 18:16:59 -03:00
DrabWeb
efd617dd34 Formatting 2017-03-15 08:53:36 -03:00
DrabWeb
7572947214 Badge -> Team 2017-03-15 08:09:44 -03:00
Dean Herbert
d208614495
Add local off-screen avatar optimisation. 2017-03-15 19:07:26 +09:00
Dean Herbert
08e93275fa
Styling fixes. 2017-03-15 17:50:52 +09:00
Dean Herbert
9d0c687453
Refactor avatar to handle better. 2017-03-15 17:04:50 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages). 2017-03-15 15:22:28 +09:00
Dean Herbert
61c45ceb08
Give Region a default value for empty ctor. 2017-03-15 14:06:22 +09:00
DrabWeb
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
DrabWeb
9912f5f9e1 Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore 2017-03-13 09:33:25 -03:00
DrabWeb
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
3098204dda Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00