1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

564 Commits

Author SHA1 Message Date
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
Dean Herbert
8ef675d9b3
Add fallback to allow FilterCriteria to run without a ruleset being set. 2017-04-18 10:55:45 +09:00
Dean Herbert
6b6690caf7
Fix filtering by ruleset. 2017-04-18 10:04:41 +09:00
Dean Herbert
f2174054ea
Fix song select. 2017-04-18 10:04:32 +09:00
Dean Herbert
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
Huo Yaoyuan
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
smoogipooo
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be Make BeatmapInfo expose Ruleset instead of PlayMode. 2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
2c3fa30386
Metric -> Metrics. 2017-04-12 21:09:39 +09:00
Dean Herbert
157ad17606 Merge branch 'master' into details 2017-04-12 20:25:51 +09:00
Jorolf
98ce9e0724 remove ?? 2017-04-12 11:25:32 +02:00
Jorolf
e285d33f8c fails, retries and size not enforced 2017-04-12 11:05:10 +02:00
Jorolf
d2affe6867 requested changes 2017-04-12 10:52:24 +02:00
ColdVolcano
50cb9e0fe7 Match stable search parameters 2017-04-11 18:07:54 -05:00
Jorolf
ed2f5d210e condensed some commits because they were small or already reversed 2017-04-11 22:48:53 +02:00
Jorolf
50b6bcd574 Merge branch 'master' into details 2017-04-11 19:06:58 +02:00
Jorolf
d4e5f55091 the power of linq 2017-04-11 18:43:48 +02:00
Jorolf
9026880495 fix 2017-04-11 14:40:12 +02:00
Jorolf
9dd8920c2c 🤔 I hope this works 2017-04-11 14:22:13 +02:00
Jorolf
bfebba3a20 null reference fixes 2017-04-11 14:12:23 +02:00
Jorolf
fb5952186c changes and fixes 2017-04-11 14:02:56 +02: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
Jorolf
ad41fd5c1a more unnecessary stuff 2017-04-10 16:49:48 +02:00
Jorolf
a597149b7f Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-10 16:42:42 +02:00
Jorolf
24b4b3ad7d update to everything 2017-04-10 16:42:23 +02:00
Dean Herbert
c6a24bb549
Merge branch 'master' into details 2017-04-10 20:07:13 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
Jorolf
bcef1ce2b6 replace space in text with Spacing in FillFlowContainer 2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5 Bar uses AccentColour aswell 2017-04-08 13:53:11 +02:00
Jorolf
5e56e84c4a change SRGBColour to Color4 and use IHasAccentColour in some places 2017-04-08 13:31:55 +02:00
Jorolf
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112 retries and fails hide if they're not present 2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c ratings hide now + remove unnessary stuff 2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45 hide MetadataSegments without content and remove fail/retry initialisations 2017-04-07 19:27:14 +02:00
Jorolf
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
Jorolf
eb4b3772e9 put Bar into its own file and let it only add a background if BackgroundColour is changed 2017-04-07 18:13:55 +02:00
Jorolf
28193cbaaa hide BeatmapDetails on entering the Select screen 2017-04-06 15:39:23 +02:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Dean Herbert
942699218a Merge branch 'master' into details 2017-04-06 15:44:43 +09:00
Dean Herbert
4b1588a21d
Fix correct mode filter not being applied when first entering song select. 2017-04-05 17:33:19 +09:00
Dean Herbert
8173d01d78
Fix crash on changing play mode too early. 2017-04-05 17:26:45 +09:00
Jorolf
b2731bb0a1 some formatting 2017-04-04 17:27:08 +02:00
Jorolf
58f8dc8254 add direction to graphs 2017-04-04 17:17:22 +02:00
Dean Herbert
7c74951454
Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages. 2017-04-04 11:13:09 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display. 2017-04-04 10:33:41 +09:00
Jorolf
8e689a06d8 change font 2017-04-03 23:03:49 +02:00
Jorolf
5a694e0c9d changed location of BarGraph to be more generic 2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-03 18:33:47 +02: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
Jorolf
017281246d changed SpriteText to OsuSpriteText 2017-04-01 18:12:44 +02:00
Jorolf
d0b4f86725 fix errors from merge 2017-04-01 14:16:18 +02:00
Jorolf
072a77b4d9 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-01 14:12:20 +02:00
Jorolf
e380254386 remove unnecessary code 2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474 removed wrong using >.> 2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78 remove unused using-directive 2017-03-31 21:19:23 +02:00
Jorolf
50b8580141 add license header 2017-03-31 21:13:20 +02:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox. 2017-03-31 17:38:33 +09:00
Jorolf
0d4f2c59a5 there's probably something in here I overlooked 2017-03-30 17:32:18 +02:00
Jorolf
15326204d5 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-30 16:38:25 +02:00
Jorolf
a3430dd072 add culture info 2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56 add readonlies and remove unused using directives 2017-03-29 16:00:29 +02:00
Jorolf
6982529481 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-29 15:47:00 +02:00
Jorolf
ab4d1c7725 better maxValue calculation for the retry and fail graph 2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8 fixes + updates to DetailsBar and a button for the TestCaseDetails 2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter. 2017-03-29 20:01:46 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +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
Jorolf
199c70ff95 Added fails and retries 2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c Added ratings and different bar rotations 2017-03-28 17:12:54 +02: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
Jorolf
775fd63d0f Added difficulty container 2017-03-25 23:33:03 +01:00
Jorolf
d8724e5e3e Add metadata details 2017-03-24 23:02:24 +01:00
Dean Herbert
cb0c7dca71 Merge branch 'master' into taiko_scoreprocessing 2017-03-24 12:25:19 +09:00
smoogipooo
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting. 2017-03-23 19:35:46 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie. 2017-03-23 19:32:58 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy. 2017-03-23 16:36:52 +09:00
Dean Herbert
6bcbd116c8
Only get APIAccess from DI (it's all we need). 2017-03-23 16:32:35 +09:00
Dean Herbert
3ae7d0cb98
Better handle the passing of Beatmap and updating of scores.
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
Dean Herbert
a561611125
Set default tab to global scores.
This will need to be saved to the config file eventually.
2017-03-23 16:29:10 +09:00
Dean Herbert
022fd625df
Remove transitions for now
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
2017-03-23 16:28:45 +09:00
DrabWeb
88d878e1d5 Formatting 2017-03-23 02:47:27 -03:00
DrabWeb
b8129526a4 Typo 2017-03-23 02:29:23 -03:00
Dean Herbert
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5 Formatting 2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
DrabWeb
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
DrabWeb
87b8015e8f Cleanup 2017-03-23 00:29:28 -03:00
DrabWeb
c173c4b7ee Tab control 2017-03-23 00:22:31 -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
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
09bf014ded Simplify fade out gradient code. 2017-03-19 21:49:29 +09:00
Dean Herbert
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +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
Dean Herbert
3d8ec4fa05 FIx transition not always being correct. 2017-03-19 02:33:25 +09: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
Seth
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -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
smoogipooo
bcaf12e3d9 Rename Criteria -> CreateCriteria and make into method. 2017-03-18 02:11:14 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls. 2017-03-17 21:21:16 +09:00
Dean Herbert
0a03bdc428
Add missing license header. 2017-03-17 20:44:02 +09:00
Dean Herbert
c7fa79b027
Fix nullref. 2017-03-17 20:09:23 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
Dean Herbert
dc28f8c79e
Remove all external access to BeatmapGroup. 2017-03-17 19:12:15 +09:00
Dean Herbert
9c664e5b05
Reorganise song select methods to allow for more flexibility. 2017-03-17 11:52:54 +09:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
Dean Herbert
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dean Herbert
e17f728282
Fix CI. 2017-03-16 17:04:03 +09:00
Dean Herbert
1a7c2eda5e
Size FilterControl relatively now that we can. 2017-03-16 17:01:02 +09:00
Dean Herbert
bd5493fb25
Add back correct defaults. 2017-03-16 16:44:14 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
Dean Herbert
4bedd4d2d7
Block input behind FilterControl. 2017-03-16 14:33:31 +09:00
Dean Herbert
da6b98db10
fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
Dean Herbert
269c1a5e5c
Reword some comments. 2017-03-16 14:08:37 +09:00
Dean Herbert
352de22590
Filter doesn't need to be public, nor have a property. 2017-03-16 14:08:29 +09:00
Dean Herbert
4d84bf7350
Change difficulty sort to be based on MaxStarDifficulty. 2017-03-16 13:59:23 +09:00
Dean Herbert
ff37d2da03
Index -> Rank + some formatting. 2017-03-16 13:15:06 +09:00