1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 18:42:56 +08:00
Commit Graph

9990 Commits

Author SHA1 Message Date
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
Dean Herbert
fdfc596abe
Merge branch 'master' into add-confirmation-dialog 2017-12-21 18:45:52 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
58859f2ffb Rework registration/instantiation of decoders to not rely on reflection 2017-12-21 15:34:00 +09:00
smoogipoo
22f8853f49 Serialize star difficulty for now 2017-12-21 14:44:51 +09:00
smoogipoo
e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
smoogipoo
bfa4f1a2c3 Apply changes in line with master changes 2017-12-21 13:59:03 +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
f6552da406 Update framework 2017-12-21 13:44:18 +09:00
smoogipoo
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +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
Dean Herbert
afcb9912e4 Reorder API / logged in checks to make more sense 2017-12-21 03:11:44 +09:00
Dean Herbert
2ff351c6cb Show retrieval failure when OnlineBeatmapID is missing 2017-12-21 03:10:09 +09:00
Aergwyn
ebc2ad55f8 greatly expanded tests for ModSelectOverlay 2017-12-20 19:05:23 +01:00
naoey
85dee3abac Increase GetScoresRequest timeout & leave existing scores when API dies. 2017-12-20 20:48:30 +05:30
naoey
8d24a04641 Remove unused usings. 2017-12-20 20:26:59 +05:30
naoey
c8c8b6810a Kill ugly retry button bounce. 2017-12-20 20:11:48 +05:30
naoey
23f4799840 Create placeholder classes instead of changing Children.
- Add MessagePlaceholder
- Use MessagePlacholder for when API is offline/user isn't a supporter
- Remove unnecessary placeholderFlow field
- Hook into API state changes
2017-12-20 20:00:52 +05:30
Dean Herbert
6d471da459 Remove unnecessary workaround 2017-12-20 21:52:03 +09:00
Dean Herbert
020d272636 Make all TestCases public 2017-12-20 21:51:00 +09:00
Dean Herbert
3292ef33fd Fix test edge cases 2017-12-20 21:16:19 +09:00
Dean Herbert
c871a25dfa Remove unnecessary constructure and make ruleset required 2017-12-20 20:41:01 +09:00
Dean Herbert
1b91f24044 Simplify scope logic 2017-12-20 20:33:16 +09:00
Dean Herbert
63dce59c8c Throw an exception if we try and retrieve local scores online 2017-12-20 20:28:00 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes 2017-12-20 20:17:11 +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