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

1723 Commits

Author SHA1 Message Date
Dean Herbert
4b9edc4645
Merge branch 'master' into profile_beatmaps 2017-11-14 20:27:17 +09:00
Dean Herbert
44671ad9cb Move common width definition to base class 2017-11-14 19:03:50 +09:00
Dean Herbert
f96f7e696d Tidy up variables a bit 2017-11-14 18:53:09 +09:00
Dean Herbert
160b988735 Reduce number of rqeuests to display beatmaps in profile
Comes at the cost of losing some information which should be loaded. This will be fixed at the osu-web end.
2017-11-14 18:51:41 +09:00
EVAST9919
08ce2705c6 Add pending and graveyarded beatmapsets to profile page 2017-11-14 08:26:44 +03:00
smoogipoo
cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919
fa6d3f9792 Reduce isLoading calls 2017-11-13 18:49:10 +03:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
0168b7eb88 Merge remote-tracking branch 'upstream/master' into profile-overlay-visual 2017-11-13 21:21:57 +09:00
Unknown
16e48ed187 Hook up download logic with BeatmapSetOverlay download buttons.
- Add noVideo option to DownloadBeatmapSetRequest
- Make Download fire an event with new download instead of returning it
2017-11-12 18:41:10 +05:30
EVAST9919
96e99d996b Add TestCase 2017-11-12 09:01:13 +03:00
EVAST9919
1792075cf9 Loading animation fix 2017-11-12 07:50:01 +03:00
EVAST9919
7c0b13f9ef CI fixes and minor visual improvements 2017-11-12 07:31:08 +03:00
EVAST9919
569780d37b Move Api request outside the scores container itself 2017-11-12 07:05:50 +03:00
EVAST9919
36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
EVAST9919
74bcc61a67 Fix possible overlapping 2017-11-11 07:51:07 +03:00
EVAST9919
057ada0183 Fix nulls 2017-11-11 07:50:40 +03:00
EVAST9919
944bdc1c25 CI fixes 2017-11-11 07:07:41 +03:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
c2f3971188 Extend Beatmap Set Response 2017-11-10 03:01:11 +03:00
EVAST9919
68c4da0810 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-09 20:02:47 +03:00
EVAST9919
a9b58a2ad2 Drawable score visual improvements 2017-11-09 17:12:06 +03:00
EVAST9919
edeeefea3b Fix missing text has been shown before api request has been completed 2017-11-08 20:42:24 +03:00
EVAST9919
13cc1fcc92 Fix wrong index offset 2017-11-07 14:30:44 +03:00
EVAST9919
8e806cd11c Simplify moving ball behaviour 2017-11-07 13:43:02 +03:00
EVAST9919
5946585a6f Apply suggested changes 2017-11-07 12:19:23 +03:00
EVAST9919
1b0e7e7145 Undo some useless changes 2017-11-07 03:44:21 +03:00
EVAST9919
60e6177b7f Use null propagation 2017-11-07 03:26:47 +03:00
EVAST9919
1063e18566 Don't show graph at all if there's no data to use 2017-11-07 03:16:27 +03:00
EVAST9919
461baf3b97 CI fixes 2017-11-07 03:05:12 +03:00
EVAST9919
28167388d6 Remove useless calls 2017-11-07 02:53:07 +03:00
EVAST9919
d10dcd82bc Rank Line Graph improvements 2017-11-07 02:39:48 +03:00
EVAST9919
a12052ac51 CI fix 2017-11-06 22:18:37 +03:00
EVAST9919
5d846bff7b Add (temporarily?) subrequest for each item to provide correct beatmap information 2017-11-06 22:05:04 +03:00
EVAST9919
b8b5c67cd2 Apply suggestion concerning the BeatmapSetType enum 2017-11-06 21:46:28 +03:00
EVAST9919
ebaef86432 Fix hard crash when opening beatmap with zero playcount in beatmap overlay 2017-11-06 21:28:01 +03:00
EVAST9919
21d8a18812 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-06 20:20:58 +03:00
smoogipoo
d24cd00a01 Merge remote-tracking branch 'origin/master' into settingsitem-getboundcopy 2017-11-06 12:39:35 +09:00
EVAST9919
729777a7e0 Remove useless variable 2017-11-04 18:38:02 +03:00
EVAST9919
48c39b1d19 Add "Ranked & Approved Beatmaps" section 2017-11-04 00:53:58 +03:00
EVAST9919
761d885167 Add Favourite Beatmaps section in UserProfileOverlay 2017-11-03 20:25:21 +03:00
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
Dean Herbert
d871c3fdda Fix test not working due to null refs 2017-10-30 20:55:23 +09:00
Dean Herbert
1ae0eff6ad Add some sanity to request/drawable creation logic 2017-10-30 19:40:42 +09:00
Dean Herbert
a51e64b2d1 Remove unnecessary schedule 2017-10-30 19:16:16 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
096998d5f4 Fix user bindable being assigned rather than bound 2017-10-30 19:08:15 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix 2017-10-30 16:22:47 +09:00
Shane Woolcock
22d222354c Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables 2017-10-26 18:45:20 +10:30
Jorolf
b2c3ba05d7 remove redundant stuff 2017-10-25 20:15:45 +02:00
Jorolf
0449639f41 remove inner classes and make User property a bindable 2017-10-25 20:07:12 +02:00
Dean Herbert
da01e81fc4 Async direct panel lookup 2017-10-25 22:14:47 +09:00
Dean Herbert
ed84cd2035 Greatly improve performance of direct panel loading
Still needs to be async'd
2017-10-25 22:14:41 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Jorolf
a2dfef301a remove unused parameters 2017-10-24 20:56:05 +02:00
Jorolf
f65d4b626e don't use c# 7 feature 2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
15b9307b6c Fix WaveOverlayContainer appearing incorrectly on first PopIn 2017-10-24 20:26:27 +09:00
Dan Balasescu
ecd641c44a Merge branch 'master' into startup-load-improvements 2017-10-24 11:54:31 +09:00
Dean Herbert
00bb82215b Merge branch 'master' into revert-to-default-glow 2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Shane Woolcock
2e6a68d358 Rename indicator class, add colour/fade easing, and add tooltip 2017-10-22 16:12:30 +10:30
Shane Woolcock
5785af9f6a Reenable revert indicator on audio device since the potential crash was addressed in #1101 2017-10-22 14:22:57 +10:30
Shane Woolcock
59b10981dc CI fixes 2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07 Fix wrong license header 2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset 2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd Fix namespace and unnecessary using 2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990 Temporarily disable revert functionality for audio device, since it crashes 2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965 Add revert-to-default glow for settings items 2017-10-21 12:44:47 +10:30
Dean Herbert
35ce6fd2bd Merge branch 'master' into notification-thread-safety 2017-10-20 11:48:14 +09:00
Dan Balasescu
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
Dean Herbert
518e5a2245 Make ProgressNotification's status and progress thread-safe
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Huo Yaoyuan
5a684f926f CI fixes. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495 Use localisation engine instead of asking current culture directly. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757 Construct DwarableScore using null weight. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
06fe874594 CI fixes. 2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f Use localisation engine instead of asking current culture directly. 2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2 Construct DwarableScore using null weight. 2017-10-15 16:15:35 +08:00
EVAST9919
bd7bc2c0d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix 2017-10-15 00:14:59 +03:00
Dan Balasescu
31b26e1d0a Merge branch 'master' into back-to-desktop 2017-10-14 16:18:28 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
37ed710cbe Merge branch 'master' into fix-duplicate-user 2017-10-14 13:36:53 +09:00
Dean Herbert
9385fd1cfa Merge branch 'master' into better-medal-loading 2017-10-14 12:29:15 +09:00
smoogipoo
c3b9644d77 Move infoFlow to local variable 2017-10-14 11:59:18 +09:00
EVAST9919
e8f85a08b8 Fix audio preview still playing after closing the beatmap overlay 2017-10-14 05:58:06 +03:00
smoogipoo
1efb33210f Only update positions when the medalContainer is loaded. 2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00