1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 05:22:57 +08:00
Commit Graph

1857 Commits

Author SHA1 Message Date
smoogipoo
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
Dean Herbert
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
Dean Herbert
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
Dean Herbert
d36982b1d9
Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
Dean Herbert
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
Dean Herbert
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
Dean Herbert
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
Aergwyn
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b fixes MusicController constantly trying to start a track
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
FreezyLemon
bf386598b6 Added a new "undelete" button that restores every beatmap with "DeletePending" set to true. 2017-11-30 10:58:32 +01:00
Nicolas Brassard
36cfa552f4 Fix SensitivitySlider keyboard control 2017-11-29 23:03:26 -08:00
jorolf
22403cac89 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-29 23:09:04 +01:00
Santeri
898c49c19d remove unnecessary assignments 2017-11-28 16:14:32 +02:00
Dean Herbert
66fa108696 Vertically centre the panels in osu!direct 2017-11-28 22:25:20 +09:00
Santeri
e9277d8cb1 last directive error... 2017-11-28 00:27:58 +02:00
Santeri
49949bf698 fix minor param/directive errors 2017-11-28 00:20:44 +02:00
Santeri
86de6f8252 derives from trianglebutton rather than osubutton 2017-11-28 00:09:58 +02:00
Santeri
0a8fa2e6de Merge branch 'master' into header-button-should-derive 2017-11-27 23:16:42 +02:00
jorolf
7f068c0c68 correct string mistake 2017-11-27 21:13:01 +01:00
Santeri Nogelainen
96f782e75a fix object reference issue maybe? 2017-11-27 13:51:56 +02:00
Santeri Nogelainen
bf8d15108e headerbutton now derives from osubutton 2017-11-27 13:39:01 +02:00
Dean Herbert
3a01bfc1ef Remove unnecessary new prefix 2017-11-27 18:53:19 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +09:00
jorolf
70b6071898 add license header 2017-11-26 22:13:52 +01:00
jorolf
4c68090e59 separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest 2017-11-26 22:06:03 +01:00
jorolf
02fa1f9dd6 move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow 2017-11-26 21:52:35 +01:00
Aergwyn
ba0b16dc0b setting BeatmapSets as list to prevent endless LINQ query chain 2017-11-26 19:35:58 +01:00
Dean Herbert
c5aacb75c6 Add hover sounds to mod buttons 2017-11-26 17:21:22 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
8d7c891882 Add hover and click sound effects to settings sidebar buttons 2017-11-26 17:17:49 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Unknown
f6a33b3ea2 fix osu!direct download reloading all panels
This fixes the recreation of all panels when a download completes.
Also fixes NullReference when you download without ever opening the details of one Set.
2017-11-25 14:45:57 +01:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section 2017-11-24 22:51:11 +01:00
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
Dean Herbert
9db6ef6657 Fix unfixed regressions 2017-11-23 20:23:47 +09:00
Dean Herbert
5ea3292dc5 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 20:21:44 +09:00
Dean Herbert
292b44d896
Merge branch 'master' into fix-nullref-on-dispose 2017-11-23 19:22:23 +09:00
Dean Herbert
4986ad73f7 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 18:44:17 +09:00
Dean Herbert
38f5c55f80 Remove not-accessed field 2017-11-23 18:11:35 +09:00
Dean Herbert
30db2ce18a Rename KudosuValue to count and remove pointless local storage 2017-11-23 17:37:02 +09:00
Dean Herbert
cf4fc05be3 Fix nullref on disposing BeatmapSetOverlay before load
Only affects VisualTests
2017-11-23 17:33:46 +09:00
Dean Herbert
6d9951d9af Use FillFlow rather than manually specifying positions 2017-11-23 17:32:41 +09:00
Dean Herbert
2ff21bbc6c Move descriptions to constructor 2017-11-23 17:29:20 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section 2017-11-23 17:19:42 +09:00
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download 2017-11-23 17:11:28 +09:00
FreezyLemon
18b0b77f0a Added requested changes. Mainly changing lambdas to direct function references. 2017-11-22 21:41:50 +01:00
jorolf
22348a3d67 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-22 21:14:11 +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
bf0184c06d One more small style fix 2017-11-21 19:34:01 +01:00
FreezyLemon
2203a84300 Small fixes and style corrections 2017-11-21 19:16:44 +01:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
FreezyLemon
a033eb46d3 Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance. 2017-11-21 16:12:23 +01:00
Dean Herbert
553a7947d7 Remove AsyncLoadWrapper dependence in MusicController 2017-11-21 12:42:28 +09:00
Dean Herbert
2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
jorolf
66c51c7b44 cleanup 2017-11-19 14:33:50 +01:00
jorolf
4281d76bcf historical section now shows the most played beatmaps 2017-11-19 14:19:05 +01:00
jorolf
1f379cab8f move BeatmapMetadataContainer to a separate class 2017-11-19 14:17:14 +01:00
jorolf
9aaefb5e97 same for PaginatedScoreContainer 2017-11-18 20:09:31 +01:00
jorolf
4264641303 fix missing text appearing when request returns nothing but beatmaps are already there 2017-11-18 18:27:30 +01:00
EVAST9919
2ff88c86ea CI fixes 2017-11-18 18:53:21 +03:00
EVAST9919
915ccf3c84 Fix some layout issues 2017-11-18 18:41:00 +03:00
EVAST9919
87f1368869 Add KudosuInfo container in the kudosu section 2017-11-18 18:19:35 +03:00
naoey
97c5956083 Make download buttons disappear instead of closing overlay.
- Also unbind event handlers
- Remove unused field
2017-11-16 19:17:22 +05:30
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
naoey
df53b884ea Removed unused stuff. 2017-11-15 18:00:19 +05:30
naoey
bbe555dc3c Pass noVideo flag on... 2017-11-15 17:49:41 +05:30
naoey
5aeeb9aac6 Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download 2017-11-15 17:38:38 +05:30
Dan Balasescu
70d960ba73
Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
Dean Herbert
fda810eb8f Remove scrollability from sub-areas in beatmap overaly
The areas that are scrollable inside the beatmap overlay make for a very frustrating experience. Let's disable them for now.
2017-11-15 19:02:56 +09:00
Dean Herbert
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
EVAST9919
60a2d84e09 Make the x position depends on the avatar size 2017-11-15 10:43:32 +03:00
EVAST9919
093ebb8b17 Apply suggested changes 2017-11-15 10:21:07 +03:00
Dean Herbert
7dd2720b4b
Merge branch 'master' into beatmap_scores 2017-11-15 13:41:38 +09:00
Dean Herbert
6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores 2017-11-15 13:18:32 +09:00
EVAST9919
8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
Dean Herbert
fa4ae72a06
Merge branch 'master' into warning-fixes 2017-11-14 20:43:23 +09:00
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