Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog
2017-12-22 00:32:25 +09:00
Dean Herbert
68035aa6a6
Merge pull request #1717 from peppy/remove-unnecessary-blocking
...
Remove manual audio thread synchronisation logic
2017-12-22 00:32:10 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking
2017-12-22 00:18:02 +09:00
Dean Herbert
44e4716a4f
Merge pull request #1715 from peppy/overlays-block-keyboard
...
Correctly make fullscreen overlays block keyboard input from drawables behind them
2017-12-22 00:16:29 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking
2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard
2017-12-21 23:51:46 +09:00
Dean Herbert
5e66212faa
Merge pull request #1718 from peppy/fix-inspectcode-bug
...
Ignore bugged inspectcode inspection
2017-12-21 23:51:35 +09:00
Dan Balasescu
0f2646fff2
Merge branch 'master' into fix-inspectcode-bug
2017-12-21 23:21:50 +09:00
Dean Herbert
13fee5402a
Remove unnecessary using
...
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
0121692919
Ignore bugged inspectcode inspection
2017-12-21 23:14:42 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog
2017-12-21 22:56:31 +09:00
Dean Herbert
572e2d30b1
Merge pull request #1671 from FreezyLemon/undelete-button-add
...
Added Button to restore recently deleted beatmaps
2017-12-21 22:56:03 +09:00
Dean Herbert
620e9737c3
Avoid many many unnecessary enumerations
2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0
Merge branch 'master' into undelete-button-add
2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard
2017-12-21 22:15:03 +09:00
Dean Herbert
e3b31f0191
Merge pull request #1709 from DevSDK/dev-overlay-counter
...
Fix retry count not displaying on pause overlay
2017-12-21 22:09:57 +09:00
Dean Herbert
abe465358c
Fix formatting
2017-12-21 21:46:57 +09:00
Dean Herbert
5b596765c8
Merge branch 'master' into dev-overlay-counter
2017-12-21 21:09:40 +09:00
FreezyLemon
e4ead36544
Added completion text
2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-21 13:00:11 +01:00
Dean Herbert
28cc125d86
Merge pull request #1711 from peppy/fix-gameplay-menu-blocking
...
Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay
2017-12-21 20:54:25 +09:00
Seokho Song
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
smoogipoo
fdd218c641
Update framework
2017-12-21 20:11:00 +09:00
Dan Balasescu
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking
2017-12-21 20:07:14 +09:00
Dan Balasescu
7d24b28095
Merge pull request #1716 from peppy/view-online-details
...
Add a right-click context option to carousel panels to view online beatmap details
2017-12-21 20:01:29 +09:00
Dean Herbert
052badc1bd
Add a right-click context option to carousel panels to view online beatmap details
2017-12-21 19:42:44 +09:00
Dean Herbert
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
Dean Herbert
b6fd5b0f17
Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay
2017-12-21 19:19:08 +09:00
Dean Herbert
fdfc596abe
Merge branch 'master' into add-confirmation-dialog
2017-12-21 18:45:52 +09:00
Dan Balasescu
504ba1d6bc
Merge pull request #1710 from peppy/make-testcases-public
...
Make all TestCases public in line with framework TestBrowser changes
2017-12-21 13:50:02 +09:00
smoogipoo
048bfd7cf0
Update framework
2017-12-21 13:32:27 +09:00
smoogipoo
e1a71f7662
Merge branch 'master' into make-testcases-public
2017-12-21 13:32:02 +09:00
Dan Balasescu
2f02e062fd
Merge pull request #1702 from Aergwyn/add-deselect-mods-button
...
Added Deselect All button to ModSelectOverlay
2017-12-21 12:01:39 +09:00
Dan Balasescu
e051353dad
Merge branch 'master' into add-deselect-mods-button
2017-12-21 11:54:46 +09:00
Aergwyn
ebc2ad55f8
greatly expanded tests for ModSelectOverlay
2017-12-20 19:05:23 +01:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
Dean Herbert
cee39af08e
Merge pull request #1707 from FreezyLemon/customize-progress-notification
...
Make completion notification text for ProgressNotifications customisable
2017-12-20 20:15:48 +09:00
Dean Herbert
9940d4630f
Merge branch 'master' into customize-progress-notification
2017-12-20 02:52:57 +09:00
FreezyLemon
b91090a4e1
Reverted update notification to original implementation
2017-12-19 16:51:36 +01:00
FreezyLemon
3644eda9a9
Changed notification from "installed" to "imported" on beatmap download
2017-12-19 11:34:23 +01:00
Dan Balasescu
fe1044a853
Merge pull request #1708 from peppy/fix-masking
...
Fix profile header not correctly being masked
2017-12-19 18:29:35 +09:00
Aergwyn
bfe986230d
Merge branch 'master' into add-confirmation-dialog
2017-12-18 17:29:06 +01:00
Aergwyn
dfd532ed44
Updated submodule osu-framework
2017-12-18 17:28:55 +01:00
Aergwyn
6ac33e3c00
made DeleteAll-button pink
2017-12-18 17:04:35 +01:00
Dean Herbert
c8afc553cb
Fix profile header not correctly being masked
...
Closes #1592 .
2017-12-18 23:55:34 +09:00
Dean Herbert
e59ce0cd28
Merge pull request #1690 from smoogipoo/editor-selection-tool
...
Implement Editor hitobject selections
2017-12-18 22:11:31 +09:00
Dean Herbert
051a3c4d47
Fix line endings
2017-12-18 21:51:00 +09:00
Dean Herbert
a74ac278fe
Merge remote-tracking branch 'upstream/master' into editor-selection-tool
2017-12-18 21:48:01 +09:00
Dean Herbert
7c8a33b757
Merge pull request #1706 from smoogipoo/play-overlay-selections
...
Implement keyboard controls in gameplay overlays (pause/fail)
2017-12-18 21:43:14 +09:00
