1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 07:38:21 +08:00
Commit Graph

311 Commits

Author SHA1 Message Date
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
4f8a830fbf Fix potential race condition with score retrieval 2018-01-02 15:30:29 +09:00
Felix Ang
755befdf84 Check for supporter before displaying loading spinner 2018-01-01 14:30:53 +01:00
Aergwyn
f7fe083018 add tooltip to country flags 2017-12-30 14:59:35 +01:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
bdda1570d1 Move Placeholder classes to own files 2017-12-22 22:44:18 +09:00
Dean Herbert
26bb3715fe Improve state and feel of leaderboard placeholders
Closes #1721.
2017-12-22 22:42:23 +09:00
Dean Herbert
aa388885b7 Adjust animation slightly 2017-12-22 00:53:34 +09:00
Dean Herbert
57fdbda16d Remove unnecessary IsLoaded check
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06 Use local bindable 2017-12-21 23:48:35 +09:00
naoey
644aaa8167 Unsubscribe from API state change event. 2017-12-21 18:00:10 +05:30
naoey
01c4b1e544 Maintain a placeholder state and add tests showing all the states.
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30
Dean Herbert
afcb9912e4 Reorder API / logged in checks to make more sense 2017-12-21 03:11:44 +09:00
Dean Herbert
2ff351c6cb Show retrieval failure when OnlineBeatmapID is missing 2017-12-21 03:10:09 +09:00
naoey
85dee3abac Increase GetScoresRequest timeout & leave existing scores when API dies. 2017-12-20 20:48:30 +05:30
naoey
8d24a04641 Remove unused usings. 2017-12-20 20:26:59 +05:30
naoey
c8c8b6810a Kill ugly retry button bounce. 2017-12-20 20:11:48 +05:30
naoey
23f4799840 Create placeholder classes instead of changing Children.
- Add MessagePlaceholder
- Use MessagePlacholder for when API is offline/user isn't a supporter
- Remove unnecessary placeholderFlow field
- Hook into API state changes
2017-12-20 20:00:52 +05:30
Dean Herbert
6d471da459 Remove unnecessary workaround 2017-12-20 21:52:03 +09:00
Dean Herbert
3292ef33fd Fix test edge cases 2017-12-20 21:16:19 +09:00
Dean Herbert
1b91f24044 Simplify scope logic 2017-12-20 20:33:16 +09:00
Unknown
47bd97363e Use ShortName for mode.
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Unknown
a30cd42ba2 Make retry button not look drunk. 2017-11-28 14:38:35 +05:30
Unknown
e832f163e7 Add failure test case.
- Only show failure if request wasn't cancelled
2017-11-28 12:09:32 +05:30
Unknown
ac1fb5118c Fix line endings and derp that was causing request failures. 2017-11-28 11:35:39 +05:30
Unknown
ae201f0ef5 R# 2017-11-26 15:03:49 +05:30
Unknown
4212315504 Use a single placeholder container for empty and retry. 2017-11-26 12:50:20 +05:30
Unknown
b261d32588 Put retry button in a BeatSyncedContainer and change error message. 2017-11-26 12:25:48 +05:30
Unknown
f4f732ca43 Remove unnecessary null check and tweak transform a bit. 2017-11-26 11:19:42 +05:30
Unknown
ae9ce2f122 Unbind ruleset event from leaderboard. 2017-11-25 21:23:36 +05:30
Unknown
0b3f75505e Don't break VisualTests and add a real beatmap step. 2017-11-25 20:59:03 +05:30
Unknown
e723e66850 Merge remote-tracking branch 'upstream/master' into leaderboard-scopes 2017-11-24 19:14:50 +05:30
Unknown
c5a78e54e9 Add a retry button for when scores request fails. 2017-11-24 18:40:52 +05:30
Dean Herbert
9db6ef6657 Fix unfixed regressions 2017-11-23 20:23:47 +09:00
naoey
b6de1ce5b6 Handle query params better. 2017-11-23 14:36:12 +05:30
Unknown
096e98b5d3 Add game mode query to request.
- Also update scores when game mode is changed
2017-11-23 14:36:12 +05:30
naoey
487483eadd Move loader hiding to a better place. 2017-11-23 14:36:12 +05:30
naoey
a58bd72c6e Add placeholder when there are no scores. 2017-11-23 14:36:12 +05:30
naoey
fe559f4b62 Add respective query params to GetScoreRequest based on selected tab. 2017-11-23 14:36:12 +05:30
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +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
smoogipoo
de7c571be3 Merge remote-tracking branch 'origin/master' into netstandard 2017-11-22 19:46:17 +09:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
e7654254d2 Remove unused code 2017-11-21 12:42:28 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
Dean Herbert
9325730f5d Fix leaderboard fadeout causing constant flow changes
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
EVAST9919
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert
b72921b30e Ensure an OnlineBeatmapID is present before attempting API requests 2017-09-15 12:44:48 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
MrTheMake
6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
MrTheMake
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
MrTheMake
920710e7d0 Assign a score's beatmap and cleanup to the Score class 2017-08-14 13:30:54 +02:00
Dean Herbert
9e1ffa27dc Fix leaderboard icons not displaying correctly 2017-08-14 12:52:20 +09:00
MrTheMake
6b1184e8af General formatting 2017-08-14 00:27:54 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3 Fix nullref in the leaderboard's test case 2017-08-13 18:00:53 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02: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
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
Nabile Rahmani
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +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
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Thomas Müller
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Dean Herbert
480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
3ca80eb149 Add readonly 2017-06-13 15:54:26 +09:00
Dean Herbert
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
Dean Herbert
8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
Dean Herbert
cab12ee55a Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed 2017-05-17 17:33:16 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
4fa22146b8 Increase safety of score lookups when leaderboard isn't visible. 2017-04-24 18:48:28 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen
# Conflicts:
#	osu.Game/Users/User.cs
2017-04-19 20:51:05 +09:00
Dean Herbert
afcd7d7fa0
Format accuracy better in LeaderboardScores. 2017-04-19 16:05:17 +09:00
Dean Herbert
7d32cc85c8
Make leaderboard scores clickable. 2017-04-18 22:22:14 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
dc3a2d45fe
Move API lookup from BeatmapDetailArea to Leaderboard. 2017-04-11 16:36:50 +09:00
Dean Herbert
ecfe68d6fb
Hide deprecated API storage variables and populate Score.User automatically. 2017-04-11 16:36:47 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display. 2017-04-04 10:33:41 +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
b96a153e0e
Resize ranks better. 2017-03-29 12:24:04 +09:00
Dan Balasescu
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dan Balasescu
e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +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
13272e6995
Make Avatar accept a user.
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
0ad070c2d8
Update grade textures. 2017-03-27 22:24:47 +09:00
smoogipooo
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
Dean Herbert
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
DrabWeb
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
Dean Herbert
f3486b7288
Add correct lifetime expiry for leaderboard content 2017-03-22 09:07:02 +09:00
Dean Herbert
7387dbd9fc
Tidy up LeaderboardScore 2017-03-22 09:04:33 +09:00
Dean Herbert
1699daaf7f
Make DrawableRank safer. 2017-03-22 08:32:28 +09:00
Dean Herbert
09bf014ded Simplify fade out gradient code. 2017-03-19 21:49:29 +09:00
Dean Herbert
256a3268ac Inline single usage of EdgeEffect. 2017-03-19 18:51:40 +09:00
Dean Herbert
8cb334a118 Adjust sizing a touch. 2017-03-19 16:34:29 +09:00
DrabWeb
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
DrabWeb
0bc8ed9c9e Use Colour for non-faded scores 2017-03-18 01:56:19 -03:00
DrabWeb
e78069af12 Parenthesis 2017-03-18 01:48:29 -03:00
DrabWeb
b9d5ab5d8c Only calculate fade for fading leaderboard scores 2017-03-18 01:44:05 -03:00
DrabWeb
fbb8e79f1a Move ctor above methods 2017-03-17 19:45:51 -03:00
DrabWeb
137611ecf3 Use LeaderboardScore height for fade 2017-03-17 19:07:45 -03:00
DrabWeb
82c02fa1fc Formatting 2017-03-17 18:29:55 -03:00
DrabWeb
27ab8e2e86 Merge 2017-03-17 18:21:35 -03:00
DrabWeb
0834b5b794 Made requested changes 2017-03-17 18:16:59 -03:00
Dean Herbert
ff37d2da03
Index -> Rank + some formatting. 2017-03-16 13:15:06 +09:00
DrabWeb
cf81467e13 Move fade start out of loop 2017-03-15 14:00:31 -03:00
DrabWeb
cd37ebdff2 Fading 2017-03-15 13:57:41 -03:00
DrabWeb
efd617dd34 Formatting 2017-03-15 08:53:36 -03:00
DrabWeb
20685d51cd Adjust delays to start at 0 2017-03-15 08:51:07 -03:00
DrabWeb
847d485d5f Remove schedules 2017-03-15 08:49:17 -03:00
DrabWeb
aea9a7b795 LeaderboardScore state, initial delay handled by leaderboard 2017-03-15 08:44:29 -03:00
DrabWeb
7572947214 Badge -> Team 2017-03-15 08:09:44 -03:00
Dean Herbert
56868e3c06
Make a few more strings literals. 2017-03-15 19:21:55 +09:00
Dean Herbert
4f95378f27
Add fade out of previously displayed scores. 2017-03-15 17:10:54 +09:00
Dean Herbert
78efecb89d
Remove Alpha 0.001 hack. 2017-03-15 17:07:56 +09:00
Dean Herbert
775a86e798
Add null-checks and fallbacks to make display work with current API version. 2017-03-15 15:22:46 +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
7bc0a1fdfe
Use fixed-width for score display. 2017-03-15 15:21:07 +09:00
Dean Herbert
dfc4bccbe0
Add some padding to leaderboard. 2017-03-15 14:42:56 +09:00
Dean Herbert
c1f56c7c0e
Scores should be enumerable. 2017-03-15 14:38:38 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API. 2017-03-15 13:55:29 +09:00
DrabWeb
09cb0d6bbc Proper icons 2017-03-14 12:58:22 -03:00
DrabWeb
94c2734b09 More warnings 2017-03-14 12:15:19 -03:00
DrabWeb
55187a8380 Warnings, accuracy formatting 2017-03-14 11:55:19 -03:00
DrabWeb
4c03b62a75 More usings 2017-03-14 11:23:48 -03:00
DrabWeb
ebe48b7c24 Removed D rank 2017-03-14 11:14:27 -03:00
DrabWeb
322446effe -Unused usings 2017-03-14 11:11:23 -03:00
DrabWeb
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
Dean Herbert
8176b4ef77
Fix merge errors. 2017-03-14 22:11:38 +09:00
Dean Herbert
12326f610e
Adjust transition to flyte's liking. 2017-03-14 22:11:29 +09:00
DrabWeb
d53f219051 Adjusted score rank size 2017-03-14 10:04:42 -03:00
DrabWeb
6bd9e3cac1 +Score ranks 2017-03-13 18:34:43 -03:00
DrabWeb
8e90e05f23 Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static 2017-03-13 12:31:46 -03:00
DrabWeb
442a2c97db Merge conflicts 2017-03-13 09:44:22 -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
5719c6656a Update to work with latest framework 2017-03-04 22:38:01 -04:00
DrabWeb
b02e413e56 Removed LeaderboardFade fully 2017-03-04 22:30:48 -04:00
DrabWeb
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
DrabWeb
d1bad34434 Enter animation, remove testing mod icons 2017-03-04 05:01:55 -04:00
DrabWeb
d6f53c8b77 Moved test data to visual test 2017-03-04 04:05:31 -04:00
DrabWeb
a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04:00