1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

7023 Commits

Author SHA1 Message Date
Dean Herbert
5a58489adf Hook up play and edit (kinda) 2017-08-30 21:12:58 +09:00
Dean Herbert
3b4b4b669b Add framework for deleting difficulties 2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc Use BeatmapSetInfo instead of WorkingBeatmap 2017-08-30 20:53:33 +09:00
Dean Herbert
8619f28ced Add context menu to beatmap difficulty (wip) 2017-08-30 20:41:53 +09:00
Dean Herbert
07da29ea1c Add context menu to beatmap set header 2017-08-30 20:41:41 +09:00
Kelvin
0e363fce1e Try to fix stuttering behavior 2017-08-29 22:26:06 -07:00
Dan Balasescu
cabf671811 Merge branch 'master' into menu-bar 2017-08-30 12:31:12 +09:00
Dan Balasescu
2742fe46cf Merge pull request #1196 from smoogipooo/menu-mvvm
Update UI controls in line with framework changes
2017-08-29 19:29:14 +09:00
Dean Herbert
dba3c9a0e2 Merge branch 'master' into menu-mvvm 2017-08-29 18:37:21 +09:00
Dan Balasescu
5e6c11e289 Merge pull request #1189 from jorolf/caps-warning
Add caps lock warning to OsuPasswordTextBox
2017-08-29 18:37:07 +09:00
Dan Balasescu
0431a9afdd Merge branch 'master' into menu-mvvm 2017-08-29 18:36:41 +09:00
Dean Herbert
24a2dc3d1e Don't use child 2017-08-29 18:31:51 +09:00
Dan Balasescu
adfc304a22 Merge branch 'master' into caps-warning 2017-08-29 18:19:50 +09:00
smoogipooo
2535313f4f Use using. 2017-08-29 18:18:36 +09:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Dan Balasescu
5559e613ac Merge pull request #1203 from huoyaoyuan/infowedge-fix
Fix InfoWedge when no beatmap available
2017-08-29 18:12:51 +09:00
smoogipooo
5b8349f90e Revert DummyWorkingBeatmap changes. 2017-08-29 18:05:27 +09:00
Huo Yaoyuan
fb3ba4fe0c Add comment for DeletePending. 2017-08-29 16:18:50 +08:00
Kelvin
e5bf3f6a6a Fix out of bounds 2017-08-29 00:46:11 -07:00
Kelvin
1eb31afd14 Get destination index using binarysearch 2017-08-29 00:39:17 -07:00
Dean Herbert
e53f2cb359 Merge branch 'master' into menu-mvvm 2017-08-29 15:57:19 +09:00
Kelvin
458c3a355f Rearrange dragging using cheeseburger icon only 2017-08-28 23:28:58 -07:00
Dean Herbert
85f876a934 Remove unused using statement 2017-08-29 15:23:32 +09:00
Dean Herbert
b91757793f Update framework 2017-08-29 15:20:56 +09:00
Kelvin
636492b9cf Rearrange tracks in OnDrag 2017-08-28 22:59:28 -07:00
Kelvin
12be5b417d Use MathHelper.Clamp
- Fix formatting
2017-08-28 22:51:26 -07:00
Dean Herbert
6304a685c3 Update framework 2017-08-29 14:43:23 +09:00
Huo Yaoyuan
4aa5ce8b41 Always load background and info wedge when no beatmap available. 2017-08-28 17:53:57 +08:00
Huo Yaoyuan
1617189475 Set DummyWorkingBeatmap's DeletePending to true. 2017-08-28 17:53:03 +08:00
smoogipooo
b17d9ac06e Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. 2017-08-28 17:55:50 +09:00
Kelvin
2f5d8a7f88 Fixed code style errors 2017-08-28 01:08:51 -07:00
Kelvin
97ebf38288 Use PlaylistList to manage Prev/Next tracks 2017-08-28 00:56:03 -07:00
Kelvin
5c3b7ac12c Allow rearranging playlist tracks 2017-08-28 00:29:44 -07:00
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