1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:52:55 +08:00
Commit Graph

6989 Commits

Author SHA1 Message Date
Dan Balasescu
f76cecc704 Merge branch 'master' into rearrange-playlist 2017-09-05 10:31:53 +09:00
smoogipooo
e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +09:00
Dean Herbert
f05c6a653d Merge pull request #1206 from Artikash/master
Adjust HP penalties/bonuses based on beatmap specification
2017-09-04 18:59:59 +09:00
Dean Herbert
ed0f2a654b Rename variable 2017-09-04 18:51:50 +09:00
Dean Herbert
12706a894e Merge branch 'master' into master 2017-09-04 18:44:12 +09:00
smoogipooo
ad966f41f5 Fix CI error. 2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6 Clamp at the end points. 2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc Add scrolling points so items can be dragged beyond the list. 2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f Add better fix for items swapping erratically. 2017-09-04 14:20:40 +09:00
smoogipooo
3b575444be Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
smoogipooo
9b0309e683 Use TakeWhile instead of reversing the list. 2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62 Fix items jumping between two indices in the edge case, use a linear search for now. 2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301 Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23 2017-09-04 09:42:24 +09:00
smoogipooo
2a64bcda85 Fix resizing bug(?). 2017-09-04 09:32:44 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
8a96c8cd87 Merge pull request #1209 from peppy/song-select-context-menus
Fix ObjectDisposal exceptions due to lingering event binds
2017-09-04 08:30:36 +09:00
Dean Herbert
543a71efcc Fix ObjectDisposal exceptions due to lingering event binds 2017-09-04 08:21:07 +09:00
Dan Balasescu
9a4cff8813 Merge pull request #1205 from peppy/song-select-context-menus
Add support for hiding individual beatmap difficulties
2017-09-04 08:10:43 +09:00
Dean Herbert
dd26c80837 Delete -> Hide 2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328 Merge branch 'master' into song-select-context-menus 2017-09-04 07:56:31 +09:00
Dan Balasescu
783f528cfc Merge pull request #1207 from peppy/fix-random-select
Fix crash on random selection from a previously null selection
2017-09-04 07:30:37 +09:00
Akash Mozumdar
c6b226b017 refactor 2017-09-01 15:32:03 -04:00
Dean Herbert
3ede685ee9 Fix crash on random selection from a previously null selection 2017-09-01 18:44:51 +09:00
Dean Herbert
b19ae7c44e Update framework 2017-09-01 18:37:46 +09:00
Dean Herbert
8e0d18d36f Add a button to restore all hidden difficulties 2017-09-01 18:26:01 +09:00
Dean Herbert
3d61cde266 Correctly delay loading of PlaySongSelect-specific components 2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00 Don't allow selection of a hidden beatmap 2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54 Add hiding support for beatmap difficulties 2017-09-01 17:57:12 +09:00
Akash Mozumdar
080bdf808c Merge branch 'master' of https://github.com/Artikash/osu 2017-08-31 21:35:59 -04:00
Akash Mozumdar
472710e5db trim whitespace 2017-08-31 21:35:30 -04:00
Akash Mozumdar
04596fee61 Update OsuScoreProcessor.cs 2017-08-31 08:26:06 -04:00
Akash Mozumdar
af2f45a980 slight edits 2017-08-31 04:44:00 -04:00
Akash Mozumdar
cbc35e0cf3 implemented hp 2017-08-31 04:31:48 -04:00
Akash Mozumdar
d252af8ab4 basic implementation of hp 2017-08-31 02:36:25 -04:00
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