1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

1593 Commits

Author SHA1 Message Date
DrabWeb
63c50f82eb Make Info updateable. 2017-09-13 12:37:18 -03:00
DrabWeb
574d7b24ff Fix some visual issues. 2017-09-13 12:07:31 -03:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
f4f7ae12b3 Merge branch 'master' into channelselection-minimum-size 2017-09-13 15:40:22 +09:00
Dean Herbert
7681d97f10 Fix typo in user profile header
Replays watched, not replay watched.
2017-09-13 15:21:04 +09:00
Dean Herbert
7835269f95 Merge branch 'master' into channelselection-minimum-size 2017-09-13 14:21:44 +09:00
DrabWeb
0a5c963c4b Remove redundant .this 2017-09-13 00:18:00 -03:00
DrabWeb
9e6f94b818 Make BeatmapPicker buttons more independent. 2017-09-13 00:13:45 -03:00
DrabWeb
0e9dc6fb85 Don't recreate header buttons on beatmap change. 2017-09-12 23:55:48 -03:00
DrabWeb
d36fc13487 Make success rate percent move with the bar. 2017-09-12 23:46:21 -03:00
DrabWeb
97e5a0d4a3 CI fixes. 2017-09-12 23:41:10 -03:00
DrabWeb
08b5d4e16c Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-12 21:26:06 -03:00
DrabWeb
680f2e232c Cleanup. 2017-09-12 21:24:43 -03:00
DrabWeb
d09bcabc8f Add a background to the overlay. 2017-09-12 21:00:20 -03:00
DrabWeb
a291bd3020 Add second beatmap set to test, fix some visual issues. 2017-09-12 20:55:17 -03:00
DrabWeb
169bfe134b Fix incorrect BasicStats padding. 2017-09-12 20:24:48 -03:00
MrTheMake
a30bd90641 Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size 2017-09-12 18:48:11 +02:00
MrTheMake
9839a3b937 Smoothly transform the chat height when opening the channel selection 2017-09-12 18:47:21 +02:00
MrTheMake
c78695cfe0 Removed redundant call 2017-09-12 18:26:52 +02:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
DrabWeb
4be8899fb2 Move Length to BeatmapOnlineInfo. 2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00
DrabWeb
e61ab72c0d Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-11 01:24:52 -03:00
DrabWeb
54172ac6ad Move header button and details components to own files. 2017-09-11 01:21:53 -03:00
Dean Herbert
8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
DrabWeb
aa9dfcc082 BeatmapPicker logic. 2017-09-09 19:05:22 -03:00
DrabWeb
cbd9c07aed BeatmapPicker design. 2017-09-09 18:19:43 -03:00
naoey
0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
naoey
e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
DrabWeb
ecd6994d74 Added favourite/download buttons and author info. 2017-09-08 19:17:39 -03:00
DrabWeb
1d3139d3c3 Basic layout. 2017-09-08 18:32:07 -03:00
naoey
20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
naoey
5a3814b02e
XMLdoc fixes and a cautionary check. 2017-09-09 01:04:55 +05:30
naoey
0e4973020a
Resharper and test case fixes. 2017-09-09 00:58:54 +05:30
naoey
00306b6e38
Maintain download progress between switching result views.
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
2017-09-09 00:57:48 +05:30
naoey
31a507372a
Don't show beatmaps that are already added. 2017-09-09 00:57:48 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
Dean Herbert
386147cc77 Merge branch 'master' into channelselection-minimum-size 2017-09-09 02:51:47 +09:00
MrTheMake
15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
MrTheMake
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
5822a6cc96 Merge branch 'master' into ranks-section 2017-09-07 15:11:07 +09:00
Dean Herbert
e5308b6247 Method rename 2017-09-06 23:12:32 +09:00
Dean Herbert
da294c9605 Don't use base call when we don't have to 2017-09-06 23:10:08 +09:00
Dean Herbert
4f49a0c183 Simplify action 2017-09-06 22:58:21 +09:00
Dean Herbert
a7fa66b9f9 Fix CI issue 2017-09-06 22:41:03 +09:00
Dean Herbert
940c45b6d1 Fix visual styling and code styling 2017-09-06 21:43:20 +09:00
Dean Herbert
c6fa899b15 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-09-06 21:43:03 +09:00
smoogipooo
5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo
1904b5edfe Only store native position instead of input state. 2017-09-05 10:38:19 +09:00
smoogipooo
e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +09:00
smoogipooo
ad966f41f5 Fix CI error. 2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6 Clamp at the end points. 2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc Add scrolling points so items can be dragged beyond the list. 2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f Add better fix for items swapping erratically. 2017-09-04 14:20:40 +09:00
smoogipooo
3b575444be Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
smoogipooo
9b0309e683 Use TakeWhile instead of reversing the list. 2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62 Fix items jumping between two indices in the edge case, use a linear search for now. 2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301 Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23 2017-09-04 09:42:24 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
d7d0e96e6b Merge branch 'master' into ranks-section 2017-09-01 18:46:53 +09:00
Dean Herbert
8e0d18d36f Add a button to restore all hidden difficulties 2017-09-01 18:26:01 +09:00
Kelvin
0e363fce1e Try to fix stuttering behavior 2017-08-29 22:26:06 -07:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Kelvin
e5bf3f6a6a Fix out of bounds 2017-08-29 00:46:11 -07:00
Kelvin
1eb31afd14 Get destination index using binarysearch 2017-08-29 00:39:17 -07:00
Dean Herbert
e53f2cb359 Merge branch 'master' into menu-mvvm 2017-08-29 15:57:19 +09:00
Kelvin
458c3a355f Rearrange dragging using cheeseburger icon only 2017-08-28 23:28:58 -07:00
Kelvin
636492b9cf Rearrange tracks in OnDrag 2017-08-28 22:59:28 -07:00
Kelvin
12be5b417d Use MathHelper.Clamp
- Fix formatting
2017-08-28 22:51:26 -07:00
Kelvin
2f5d8a7f88 Fixed code style errors 2017-08-28 01:08:51 -07:00
Kelvin
97ebf38288 Use PlaylistList to manage Prev/Next tracks 2017-08-28 00:56:03 -07:00
Kelvin
5c3b7ac12c Allow rearranging playlist tracks 2017-08-28 00:29:44 -07:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
66db3389f6 Update in line with framework changes. 2017-08-28 12:49:33 +09:00
Dean Herbert
ee85515d95 Changes in line with framework changes 2017-08-25 19:18:07 +09:00
smoogipooo
9f02000174 Update FilterControl using new AccentColour definition 2017-08-25 15:58:42 +09:00
smoogipooo
e83a554ffc Update CollectionsDropdown in line with framework 2017-08-25 15:58:09 +09:00
smoogipooo
923ffae42c Update SlimEnumDropdown in line with framework 2017-08-25 15:57:55 +09:00
smoogipooo
b42c9d21fe Update LoginSettings in line with framework. 2017-08-25 15:57:43 +09:00
Dean Herbert
782ab81a88 Merge branch 'master' into update-edge-effect-fades 2017-08-25 15:01:01 +09:00
Dean Herbert
70154d1036 Update usage of FadeEdgeEffect
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
Dan Balasescu
0d7592d9a6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:35:38 +09:00
Dan Balasescu
ebf3300cb6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969 Merge branch 'master' into correct-direct-toolbar-icon 2017-08-25 13:05:47 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d Load direct panels more asynchronously to avoid stutter 2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2 Disallow multiple download requests for the same panel 2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36 Remove downloaded beatmap panels from osu!direct 2017-08-25 11:53:41 +09:00
Dean Herbert
febf0348be Permit nulls to allow test cases to run successfully 2017-08-24 21:26:50 +09:00
Dean Herbert
0082640548 Add missing licence header 2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dean Herbert
32a23c7fe4 Add initial osu!direct beatmap download and import process 2017-08-24 20:16:03 +09:00
Dean Herbert
9c82593c9e Add cancel event to ProgressNotification 2017-08-24 20:15:45 +09:00
Dean Herbert
cacf256aad Add placeholder download method with progress bar 2017-08-24 18:51:50 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
a2549157ca Add hover effects 2017-08-24 18:18:03 +09:00
Dean Herbert
4e1cf329c8 Move background logic to base class; reduce overdraw after set fades in 2017-08-24 17:39:39 +09:00
Dean Herbert
76a95495d3 Move shared code to base class 2017-08-24 17:30:10 +09:00
naoey
6291bd5ced Handle null current channel in setter, update framework. 2017-08-24 10:40:42 +05:30
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab Don't use virtual methods in ctor, always create closeButton. 2017-08-24 09:48:53 +05:30
Dean Herbert
c99ed6fd44 Add reset button
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dan Balasescu
a18507b3b4 Merge branch 'master' into fix-incorrect-notification-count 2017-08-23 17:22:39 +09:00
Dean Herbert
efdd5eb152 Fix global key bindings being fetched with a non-null variant 2017-08-23 16:10:31 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
smoogipooo
38a4c84163 Load SettingsSubsection in load()
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
2017-08-23 12:48:53 +09:00
Dean Herbert
b2db550cb4 Fix notification count including fading (already closed) notifications 2017-08-23 12:47:20 +09:00
smoogipooo
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
Dean Herbert
630d67405f Merge branch 'master' into update-changelog-notification 2017-08-23 00:12:59 +09:00
Dean Herbert
a257c6846e Merge branch 'master' into zero-notifications-closes 2017-08-22 22:45:52 +09:00
jorolf
3025fcdb25 Merge branch 'master' into ranks-section 2017-08-22 13:19:03 +02:00
Dean Herbert
480d839d67 Allow the notification overlay to close when all notifications are dismissed 2017-08-22 19:51:42 +09:00
Dean Herbert
ab0e3ccc55 Make SimpleNotifications support word wrap 2017-08-22 19:33:18 +09:00
Dean Herbert
97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
Dean Herbert
ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
Dean Herbert
7693fc1382 Merge branch 'master' into mask-settings-overlay 2017-08-22 00:22:39 +09:00
Dean Herbert
1d0b89d592 Restore usage of AddRange 2017-08-21 18:51:14 +09:00
Dean Herbert
9ba2258f80 Add spaces for smoogipoo 2017-08-21 17:44:39 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
Jorolf
9b20da94e7 change Query to AllRulesets 2017-08-19 22:07:03 +02:00
Jorolf
bae1340b50 mask the settings overlay 2017-08-19 17:00:01 +02:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
naoey
7ad4c046db Make current value behaviour between channels and tabs consistent.
- Trim whitespace
2017-08-18 13:35:48 +05:30
Dan Balasescu
f5c3af2f20 Merge branch 'master' into fix-nullref 2017-08-18 12:38:20 +09:00
Dean Herbert
02aa38d1c2 Merge branch 'master' into toolbar-button-swap 2017-08-18 11:18:19 +09:00
Dean Herbert
e4b832e8a6 Fix a possible nullref when login fails 2017-08-18 10:49:41 +09:00
MrTheMake
6118209200 Fix unlit initial state of the OnScreenDisplay 2017-08-17 18:46:16 +02:00
Dean Herbert
f459794665 Update MainSettings.cs 2017-08-17 18:11:15 +09:00
Dean Herbert
58b1e9c954 Remove unused DI retrieval 2017-08-17 17:47:55 +09:00
Dean Herbert
a19fc28cff Visually improve settings transitions and back button 2017-08-17 17:31:14 +09:00
naoey
4f7ae1ed8b Clear messages when the current channel is removed.
- Stop using TabContainer.Children
2017-08-17 09:00:45 +05:30
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
0c19202b9a Add basic back button 2017-08-16 23:20:18 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
71f83dbdfa Add null check for safety 2017-08-16 22:56:32 +09:00
Dean Herbert
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Thomas Müller
16372d9b45 Merge branch 'master' into key-config-settings 2017-08-16 17:48:00 +09:00
Dean Herbert
7e1fc47b76 Fix forgotten rename 2017-08-16 17:43:01 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
25a3835c3c Cancel pending sidebar expansion when a button is clicked 2017-08-16 17:06:20 +09:00