Commit Graph

6519 Commits

Author SHA1 Message Date
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
ee92986494 Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
00c8d2ff11 Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader
Allows it to integrate better with existing buttons, like HeaderButton.
2018-06-04 20:12:43 -03:00
416384956d Use a protected Downloaded bindable instead of abstract methods. 2018-06-04 06:47:39 -03:00
b332c22fe5 Update DirectPanel to use BeatmapSetDownloadButton. 2018-06-04 06:29:35 -03:00
4b604bf055 Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
7101533926 Remove 'description' field 2018-06-03 08:02:57 -07:00
5c713ac2ab Use default colour in MetadataSection 2018-06-03 07:51:57 -07:00
f0095193b3 Merge branch 'master' into overlay-activation 2018-06-03 11:52:33 +02:00
707af02097 apply feedback
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
9b69e1825d Make PreviewTrack.owner private 2018-06-02 22:06:45 +03:00
dc2a004c87 Remove link colours for all unlinked text 2018-06-02 12:04:58 -07:00
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
e98f9f1323 Add dropdown for selecting fullscreen resolution 2018-06-02 21:02:45 +03:00
5bb6757cbd Remove unused previewTrackManager parameter 2018-06-02 13:03:17 +03:00
70120aa14c Remove unused previewTrackManager variable 2018-06-02 12:28:16 +03:00
330ce19041 Make PreviewTrack a component and use LoadComponentAsync 2018-06-01 23:36:25 +03:00
88ac427ba6 PreviewTrack.Owner 2018-06-01 21:06:37 +03:00
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
ae6f603d16 Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
8bde1fd327 Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
729f2ec725 Match authorinfo with web 2018-05-31 14:34:47 -07:00
b4d621a2cb Add link colour to beatmap source 2018-05-31 10:21:22 -07:00
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
42bc6b6b2e Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
49a683e386 Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages 2018-05-31 14:50:20 +09:00
0f6c623ebb Tidy up some unnecessary lines 2018-05-31 12:44:59 +09:00
205aa1a3cd Fetch colour from OsuColour palette 2018-05-31 12:44:11 +09:00
319faf12f7 Fix incorrect naming of label 2018-05-31 12:39:56 +09:00
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
2b3a630270 add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
bcdbd97da9 Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +02:00
05b0564381 Create DrawableJoinDate somehow and remove dateFormat argument 2018-05-25 13:30:29 +02:00
961702aadf Apply the format fix to the tooltip text across the board 2018-05-25 13:05:41 +02:00
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
568d4882c6 Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00