Commit Graph

2415 Commits

Author SHA1 Message Date
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
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
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
d6076eb591 Merge branch 'master' into multiple_previews_different_overlays 2018-05-24 20:51:54 +03:00
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09:00
10bc3917b5 Apply suggested changes 2018-05-23 11:17:13 +02:00
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00
8e9dde97ce Better match join and last seen texts and tooltips with osu-web 2018-05-23 03:24:37 +02:00
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
a7bdaf75b0 Ensure badges are ordered correctly 2018-05-22 13:05:15 +02:00
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
9e17eb2342 Reword settings text to be ruleset agnostic 2018-05-21 16:03:08 +09:00
cea935ea40 Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
c75ef7704a Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings 2018-05-21 14:49:34 +09:00
42519e3723 Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
2018-05-21 14:49:26 +09:00
d75fe4009a Add back action support to settings back button 2018-05-18 13:40:35 +09:00
6a1abf4084 Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
fc192c8998 Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons 2018-05-15 19:23:51 +09:00
5fee471307 Merge branch 'master' into beatmap-delete-fix 2018-05-15 14:49:09 +09:00
4055a6fc0c Merge branch 'master' into ruleset-keybindings 2018-05-14 15:39:10 -07:00
7507d18a93 Merge branch 'master' into mapping-del 2018-05-14 20:56:12 +09:00
addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00