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

7291 Commits

Author SHA1 Message Date
smoogipooo
9142e75610 Merge branch 'menu-mvvm' into menu-bar 2017-08-28 15:44:28 +09:00
smoogipooo
83fe8514a4 Remove unnecessary exception, replace with default value. 2017-08-28 15:44:05 +09:00
smoogipooo
7c9c7f93ae Remove unnecessary exception, replace with default styling. 2017-08-28 15:42:21 +09:00
smoogipooo
423c1cb006 Merge branch 'menu-mvvm' into menu-bar 2017-08-28 15:34:01 +09:00
smoogipooo
7bf6d4aa65 Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu. 2017-08-28 15:33:24 +09:00
smoogipooo
5dae408ecb Reimplement TestCaseEditorMenuBar. 2017-08-28 15:32:12 +09:00
smoogipooo
a5fbeb8959 Merge branch 'menu-mvvm' into menu-bar 2017-08-28 14:52:44 +09:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
41b162d9e3 Merge branch 'menu-mvvm' into menu-bar 2017-08-28 12:52:49 +09:00
smoogipooo
66db3389f6 Update in line with framework changes. 2017-08-28 12:49:33 +09:00
smoogipooo
b5c1c05af5 Remove poop. 2017-08-28 11:03:51 +09:00
smoogipooo
4385edeb45 Update usages of Menu to reflect ValueChanged events. 2017-08-28 11:01:53 +09:00
smoogipooo
fc4437b91a Merge remote-tracking branch 'smoogipooo/menu-mvvm' into menu-bar
# Conflicts:
#	osu-framework
2017-08-28 08:27:53 +09:00
Jorolf
9374bf925e only show warning when focused 2017-08-25 16:39:49 +02:00
Jorolf
26323caf6f Merge branch 'master' of git://github.com/ppy/osu into caps-warning 2017-08-25 16:33:29 +02:00
Dean Herbert
ee85515d95 Changes in line with framework changes 2017-08-25 19:18:07 +09:00
Dan Balasescu
5f746c1c6a Merge pull request #1194 from peppy/update-edge-effect-fades
Update usage of FadeEdgeEffect
2017-08-25 16:29:49 +09:00
smoogipooo
3ffc467704 Fix crappy resizing. 2017-08-25 16:27:01 +09:00
smoogipooo
9f02000174 Update FilterControl using new AccentColour definition 2017-08-25 15:58:42 +09:00
smoogipooo
ce644138b9 Update OsuTabControl in line with framework 2017-08-25 15:58:30 +09:00
smoogipooo
a3a5a89636 Update OsuDropdown in line with framework 2017-08-25 15:58:21 +09:00
smoogipooo
e83a554ffc Update CollectionsDropdown in line with framework 2017-08-25 15:58:09 +09:00
smoogipooo
923ffae42c Update SlimEnumDropdown in line with framework 2017-08-25 15:57:55 +09:00
smoogipooo
b42c9d21fe Update LoginSettings in line with framework. 2017-08-25 15:57:43 +09:00
smoogipooo
4fb9570618 Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework. 2017-08-25 15:10:29 +09:00
smoogipooo
7467d24d35 Update OsuContextMenu in line with framework. 2017-08-25 15:10:12 +09:00
smoogipooo
06c392d6f2 Update OsuMenu in line with framework. 2017-08-25 15:09:07 +09:00
Dean Herbert
782ab81a88 Merge branch 'master' into update-edge-effect-fades 2017-08-25 15:01:01 +09:00
Dan Balasescu
11fd91bc68 Merge pull request #1190 from peppy/concurrent-overlay-limits
Ensure other full-screen overlays are closed when direct is open (and vice-versa)
2017-08-25 15:00:40 +09:00
Dean Herbert
70154d1036 Update usage of FadeEdgeEffect
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
Dean Herbert
c0cf26ed21 Merge branch 'master' into concurrent-overlay-limits 2017-08-25 14:50:45 +09:00
Dean Herbert
66c556f8f9 Merge pull request #1193 from peppy/beatmap-background-disposal-fix
Fix beatmap background being disposed too early
2017-08-25 14:50:34 +09:00
Dan Balasescu
0d7592d9a6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:35:38 +09:00
Dean Herbert
67513177e6 Merge pull request #1192 from peppy/correct-direct-toolbar-icon
Use the correct icon for osu!direct in the toolbar
2017-08-25 13:24:44 +09:00
Dean Herbert
72a16e31dd Remove unnecessary old code 2017-08-25 13:07:10 +09:00
Dan Balasescu
ebf3300cb6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969 Merge branch 'master' into correct-direct-toolbar-icon 2017-08-25 13:05:47 +09:00
Dan Balasescu
b69c099d0f Merge pull request #1191 from peppy/direct-concurrency
Disallow concurrent download
2017-08-25 13:05:34 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d Load direct panels more asynchronously to avoid stutter 2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2 Disallow multiple download requests for the same panel 2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36 Remove downloaded beatmap panels from osu!direct 2017-08-25 11:53:41 +09:00
Dean Herbert
2dd3e51373 Ensure other full-screen overlays are closed when direct is open (and vice-versa) 2017-08-25 10:51:28 +09:00
Jorolf
f8cc4238ff cleanup code 2017-08-24 22:13:20 +02:00
Dan Balasescu
cf251b70c7 Merge pull request #1184 from peppy/direct-downloads
Add osu!direct download support
2017-08-24 21:52:56 +09:00
Dean Herbert
307c4dd392 Merge branch 'master' into direct-downloads 2017-08-24 21:30:38 +09:00
Dean Herbert
fd72093454 Merge pull request #1182 from peppy/replay-updates
Fix replays not working with new action system
2017-08-24 21:30:20 +09:00
Dean Herbert
febf0348be Permit nulls to allow test cases to run successfully 2017-08-24 21:26:50 +09:00
Dean Herbert
1b0a1dd410 Add missing licence header 2017-08-24 20:37:03 +09:00