1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Commit Graph

9318 Commits

Author SHA1 Message Date
Dean Herbert
6ef575c005 Update framework 2017-12-22 15:46:45 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00
Dean Herbert
be526d68e8
Merge pull request #1599 from naoey/leaderboard-scopes
Make leaderboard tabs and active ruleset filter scores
2017-12-22 01:23:24 +09:00
Dean Herbert
aa388885b7 Adjust animation slightly 2017-12-22 00:53:34 +09:00
Dean Herbert
5c9d484395 Adjust debounce a bit 2017-12-22 00:50:32 +09:00
Dean Herbert
40ceaf12f2
Merge branch 'master' into leaderboard-scopes 2017-12-22 00:44:24 +09:00
Dean Herbert
efc790e5c3
Merge pull request #1676 from Aergwyn/add-confirmation-dialog
Added confirmation dialog for "Delete ALL beatmaps"
2017-12-22 00:44:07 +09:00
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
Dean Herbert
57fdbda16d Remove unnecessary IsLoaded check
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06 Use local bindable 2017-12-21 23:48: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
smoogipoo
ac1d27e925 Fix possible nullref exceptions 2017-12-21 23:02:46 +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
smoogipoo
790aa8be2a Merge master into beatmap-serialization 2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f Remove now unused references 2017-12-21 22:13:18 +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
4bd2c7e95f Fix minor formatting issue 2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c Fix formatting 2017-12-21 21:46:57 +09:00
naoey
644aaa8167 Unsubscribe from API state change event. 2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes 2017-12-21 21:18:56 +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
d80079a73a Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-21 20:15:01 +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
smoogipoo
eb382dc23f Update framework 2017-12-21 19:58:41 +09:00
smoogipoo
2fb8895e66 Add spacer to menu 2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa Remove migration setting in favour of export option in the editor 2017-12-21 19:56:12 +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
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +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
naoey
01c4b1e544 Maintain a placeholder state and add tests showing all the states.
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30