1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 21:27:24 +08:00
Commit Graph

8487 Commits

Author SHA1 Message Date
naoey
6ea6a10def Reduce size of download button in list view to fit hover effect 2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615 Update direct panel download button for new design
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
Dean Herbert
1e1ff8339e
Merge branch 'master' into non-null-nestedobjects 2018-07-03 19:43:46 +09:00
smoogipoo
73851fb194 Fix beatmap details not working for unranked beatmaps 2018-07-03 15:57:05 +09:00
Dean Herbert
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash 2018-07-02 18:09:11 +09:00
Dean Herbert
6c848f135c Add comment about last button invocation 2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups 2018-07-02 17:41:16 +09:00
Dan Balasescu
6abb3fa62c
Merge branch 'master' into add-scroll-speed-keybinds 2018-07-02 17:26:05 +09:00
smoogipoo
f0ec117bcb Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder 2018-07-02 17:17:40 +09:00
smoogipoo
9f405b0894 Don't hard-bail if config skin doesn't exist anymore 2018-07-02 16:49:07 +09:00
ekrctb
ae6fdd8e29 whitespace 2018-07-02 16:20:44 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
ekrctb
63746876c2 typo 2018-07-02 16:09:33 +09:00
ekrctb
341ffa4667 Fix MenuCursor crash 2018-07-02 16:07:52 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset 2018-07-02 15:32:55 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash 2018-07-02 15:01:59 +09:00
Dan Balasescu
50f561fbc2
Merge branch 'master' into allow-back-in-player 2018-07-02 14:44:58 +09:00
Dean Herbert
596787c941 Standardise input handling of popup dialogs 2018-07-02 14:25:12 +09:00
Dean Herbert
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
Dean Herbert
b7893bc994 Remove unnecessary comments 2018-07-02 13:07:44 +09:00
Dean Herbert
6a459efd8f Don't allow Key.Escape 2018-07-02 11:04:40 +09:00
Dean Herbert
2c597874bf Fix leaderboard showing placeholder briefly when entering song select 2018-07-01 18:17:02 +09:00
Dean Herbert
98fb2e03c0 Fix rulesets not loading in debug builds after running a release build 2018-07-01 18:03:15 +09:00
Dean Herbert
b1403d837e Add back support for closing focused overlays using back key 2018-07-01 15:52:47 +09:00
Dean Herbert
7028767e50 Fix regression in HoldFocus behaviour 2018-07-01 14:08:34 +09:00
Dean Herbert
00fd5c8dbc Fix regression causing binding settings to fail 2018-06-30 23:51:27 +09:00
Dean Herbert
754e072e01 Don't handle all actions 2018-06-29 23:35:14 +09:00
Dean Herbert
fb90a4924b Only clear text in FocusedTextBox 2018-06-29 23:28:15 +09:00
Dean Herbert
7c0547b4ee Replace todo 2018-06-29 23:16:05 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player 2018-06-29 21:54:18 +09:00
Dean Herbert
ad28f88498 Fix protection change 2018-06-29 21:25:51 +09:00
Dean Herbert
cd47bd2cf8 Update framework 2018-06-29 21:06:43 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
smoogipoo
6d6436c8d3 Fix ruleset not getting updated if changed 2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626 SongSelect needs to recache as IBindable 2018-06-29 20:50:30 +09:00
Dean Herbert
8cf1553fd5 Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-29 20:30:42 +09:00
Dean Herbert
06bd3d4815 Use IBindable where possible 2018-06-29 20:28:28 +09:00
Dean Herbert
0e649b8866 Change logic 2018-06-29 20:16:24 +09:00
Dean Herbert
34fef3caba Update exception type 2018-06-29 20:13:29 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset 2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b Ensure toolbar triggers updates to SongSelect's ruleset 2018-06-29 19:32:42 +09:00
Dean Herbert
182ac80881 Cache also as IBindable 2018-06-29 19:25:28 +09:00
Dean Herbert
6d6fcc953b Trim lines 2018-06-29 19:25:20 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-29 18:45:37 +09:00
smoogipoo
1e696d247e Re-privatise 2018-06-29 18:33:28 +09:00
Dan Balasescu
8abcf68188
Merge branch 'master' into fix-negative-online-set-id 2018-06-29 18:29:36 +09:00
Dean Herbert
4212a9d0d7
Fix incorrect migration conditional 2018-06-29 18:23:53 +09:00