1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 05:37:25 +08:00
Commit Graph

2382 Commits

Author SHA1 Message Date
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dean Herbert
b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +09:00
Dean Herbert
cee5be1d56 Improve precision wheel adjustment handling 2018-06-13 17:03:56 +09:00
Dean Herbert
e0b68e4e09 Fix hide re-schedule not triggering on noop state change 2018-06-13 16:47:10 +09:00
Dean Herbert
a55bf82fd9 Handle hover blocking in VolumeOverlay to ensure correct hide scheduling 2018-06-13 16:46:56 +09:00
Dean Herbert
2a18625b2c Correctly block scroll events when hovering controls 2018-06-13 16:46:27 +09:00
Dean Herbert
2cc7953421 Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls 2018-06-13 16:14:20 +09:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays 2018-06-12 19:26:51 +09:00
Dan Balasescu
80ec0b1839
Merge branch 'master' into populate-missing-online-ids 2018-06-12 14:03:23 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids 2018-06-12 13:11:21 +09:00
Dan Balasescu
41452a0754
Merge branch 'master' into multiple_previews_different_overlays 2018-06-11 18:56:50 +09:00
Dan Balasescu
7de8e1cfc4
Merge branch 'master' into refactor-api 2018-06-11 18:49:15 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Dean Herbert
a880e626d8 Use for loop and SetLayoutPosition 2018-06-08 21:20:15 +09:00
Dean Herbert
1e7bffe5e3
Merge branch 'master' into badge-ordering 2018-06-08 21:13:35 +09:00
Dean Herbert
803598c3d0 Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader 2018-06-08 20:54:14 +09:00
Dean Herbert
59e5a8556f Fix volume control adjustment being extreme when precision scrolling 2018-06-08 18:15:03 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader 2018-06-08 16:28:25 +09:00
Dean Herbert
955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert
8cc31aca54 Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
0fae49ee21 Don't add a 'with Video' subtitle. 2018-06-07 20:47:27 -03:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Roman Kapustin
1fdbd20471 Nullref quickfix in PlayButton 2018-06-07 14:50:21 +03:00
Roman Kapustin
ab6699b1fb Stop DirectOverlay preview on search update 2018-06-07 14:40:41 +03:00
Roman Kapustin
3033294df1 Stop Preview on BeatmapSet change 2018-06-07 14:30:11 +03:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
17ba129e61 Make volume controls stay open when hovered
Closes #2743.
2018-06-07 01:14:43 +09:00
Dean Herbert
dd75cd973b Show UI mouse cursor when hovering volume meters during gameplay
Also adds a hover animation.
2018-06-07 01:13:35 +09:00
Dean Herbert
621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
Dean Herbert
ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
Dean Herbert
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader 2018-06-06 20:32:58 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
Dean Herbert
0a97b8ae25 Implement DebugUtils locally
Has been removed from framework
2018-06-06 18:33:10 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Aergwyn
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
Dean Herbert
9e25e02696 Ensure notifications don't appear during UserTriggered mode
Closes #2640.
2018-06-06 15:50:24 +09:00
Dean Herbert
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
DrabWeb
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb
df4c855aa2 Manage subtitle inside of DownloadButton. 2018-06-06 03:13:37 -03:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Dean Herbert
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
DrabWeb
4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
DrabWeb
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader
Allows it to integrate better with existing buttons, like HeaderButton.
2018-06-04 20:12:43 -03:00
DrabWeb
416384956d Use a protected Downloaded bindable instead of abstract methods. 2018-06-04 06:47:39 -03:00
DrabWeb
b332c22fe5 Update DirectPanel to use BeatmapSetDownloadButton. 2018-06-04 06:29:35 -03:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
Joehu
7101533926 Remove 'description' field 2018-06-03 08:02:57 -07:00
Joehu
5c713ac2ab Use default colour in MetadataSection 2018-06-03 07:51:57 -07:00
Aergwyn
f0095193b3 Merge branch 'master' into overlay-activation 2018-06-03 11:52:33 +02:00
Aergwyn
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
Roman Kapustin
9b69e1825d Make PreviewTrack.owner private 2018-06-02 22:06:45 +03:00
Joehu
dc2a004c87 Remove link colours for all unlinked text 2018-06-02 12:04:58 -07:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
Roman Kapustin
5bb6757cbd Remove unused previewTrackManager parameter 2018-06-02 13:03:17 +03:00
Roman Kapustin
70120aa14c Remove unused previewTrackManager variable 2018-06-02 12:28:16 +03:00
Roman Kapustin
330ce19041 Make PreviewTrack a component and use LoadComponentAsync 2018-06-01 23:36:25 +03:00
Roman Kapustin
88ac427ba6 PreviewTrack.Owner 2018-06-01 21:06:37 +03:00
Dean Herbert
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
Joehu
729f2ec725 Match authorinfo with web 2018-05-31 14:34:47 -07:00
Joehu
b4d621a2cb Add link colour to beatmap source 2018-05-31 10:21:22 -07:00
Joehu
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
DrabWeb
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
Dean Herbert
0f6c623ebb Tidy up some unnecessary lines 2018-05-31 12:44:59 +09:00
Dean Herbert
205aa1a3cd Fetch colour from OsuColour palette 2018-05-31 12:44:11 +09:00
Dean Herbert
319faf12f7 Fix incorrect naming of label 2018-05-31 12:39:56 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
Aergwyn
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
smoogipoo
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
Dean Herbert
bcdbd97da9
Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
Roman Kapustin
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
HoutarouOreki
3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +02:00
HoutarouOreki
05b0564381 Create DrawableJoinDate somehow and remove dateFormat argument 2018-05-25 13:30:29 +02:00
HoutarouOreki
961702aadf Apply the format fix to the tooltip text across the board 2018-05-25 13:05:41 +02:00
Dean Herbert
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
Dean Herbert
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00
Roman Kapustin
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
UselessToucan
d6076eb591
Merge branch 'master' into multiple_previews_different_overlays 2018-05-24 20:51:54 +03:00
smoogipoo
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09:00
HoutarouOreki
10bc3917b5 Apply suggested changes 2018-05-23 11:17:13 +02:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00