Commit Graph

6037 Commits

Author SHA1 Message Date
eb1b1da732 Merge branch 'master' into overlays-block-keyboard 2017-12-21 23:51:46 +09:00
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
a9039c71e0 Merge branch 'master' into undelete-button-add 2017-12-21 22:32:08 +09:00
5cd2a3950e Merge branch 'master' into overlays-block-keyboard 2017-12-21 22:15:03 +09:00
abe465358c Fix formatting 2017-12-21 21:46:57 +09:00
5b596765c8 Merge branch 'master' into dev-overlay-counter 2017-12-21 21:09:40 +09:00
e4ead36544 Added completion text 2017-12-21 13:01:14 +01:00
cbc1aacf5c Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-21 13:00:11 +01:00
6fbd06f967 Fix Not update retry counter on PauseOverlay
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.

Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
50afc6e9c9 Merge branch 'master' into fix-gameplay-menu-blocking 2017-12-21 20:07:14 +09:00
052badc1bd Add a right-click context option to carousel panels to view online beatmap details 2017-12-21 19:42:44 +09:00
1895b16d67 Correctly make fullscreen overlays block keyboard input from drawables behind them
- [ ] Depends on #1711 to get correct global binding handling.
2017-12-21 19:34:20 +09:00
b6fd5b0f17 Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay 2017-12-21 19:19:08 +09:00
e051353dad Merge branch 'master' into add-deselect-mods-button 2017-12-21 11:54:46 +09:00
ebc2ad55f8 greatly expanded tests for ModSelectOverlay 2017-12-20 19:05:23 +01:00
9940d4630f Merge branch 'master' into customize-progress-notification 2017-12-20 02:52:57 +09:00
3644eda9a9 Changed notification from "installed" to "imported" on beatmap download 2017-12-19 11:34:23 +01:00
c8afc553cb Fix profile header not correctly being masked
Closes #1592.
2017-12-18 23:55:34 +09:00
051a3c4d47 Fix line endings 2017-12-18 21:51:00 +09:00
a74ac278fe Merge remote-tracking branch 'upstream/master' into editor-selection-tool 2017-12-18 21:48:01 +09:00
fabf1bf60a Make the captured objects not update for now
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
5493493f82 FinishCapture -> FinishDrag from Handles 2017-12-18 19:24:41 +09:00
09c51df2bd Marker* -> Handle 2017-12-18 19:21:26 +09:00
3999940538 DragSelector -> HitObjectSelectionBox 2017-12-18 19:17:26 +09:00
ba614883ea used Any() instead of manually checking count == 0 (CI) 2017-12-18 11:16:57 +01:00
f898481523 Changed existing implementations to have a custom CompletionText 2017-12-18 11:14:07 +01:00
5e111e14db Make it possible to change the overlay actions beyond instantiation 2017-12-18 19:13:25 +09:00
a17b2e4c18 Expose buttons for test cases 2017-12-18 19:13:08 +09:00
7c9d11756e Add the ability to change what text is displayed when a ProgressNotification finishes its task. 2017-12-18 10:59:25 +01:00
d2b80fdbfc Moved "undelete all" logic to BeatmapManager and added a progress notification 2017-12-18 10:55:07 +01:00
918e7c9a4b MenuOverlay -> GameplayMenuOverlay 2017-12-18 16:40:50 +09:00
cf640d084e Use using 2017-12-18 16:38:15 +09:00
846750a190 Remove unnecessary flag 2017-12-18 16:36:11 +09:00
5f538f03ea Comments 2017-12-18 16:34:25 +09:00
59365bbdce Make MenuOverlay support key selections 2017-12-18 16:34:17 +09:00
4c45102d61 Merge branch 'master' into undelete-button-add 2017-12-18 16:28:32 +09:00
8fdaf6f8f4 Restructure DialogButton to support selection 2017-12-18 14:47:17 +09:00
812181190e Update SelectionLayer.cs 2017-12-18 14:10:14 +09:00
f3a5258c5b Reorder file (ctor + bdl) 2017-12-18 14:05:12 +09:00
17c58678cf Update SelectionInfo.cs 2017-12-18 13:59:46 +09:00
35b6114d01 Merge branch 'master' into editor-selection-tool 2017-12-18 13:57:32 +09:00
57e5b2debe Merge branch 'master' into add-deselect-mods-button 2017-12-18 13:48:35 +09:00
6121cd3b67 Remove animating skipping and reorder file a bit 2017-12-18 12:30:39 +09:00
23e014b52d Simplify drawable removal logic 2017-12-18 12:05:49 +09:00
b2cd32eb95 Move children to CarouselGroup 2017-12-18 11:57:13 +09:00
7173829896 Add filter checks to difficulty selection 2017-12-18 11:43:10 +09:00
4c1f00567b Fix incorrect flush logic when starting play from non-selected difficulty using context menu 2017-12-18 11:31:38 +09:00
4e46565f6e Remove todo 2017-12-18 11:25:02 +09:00
5bfb6d1f58 Remove unused variable 2017-12-18 11:13:51 +09:00
b21c22085d Make more things private 2017-12-18 11:13:16 +09:00