RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,375 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

1463 Commits

Author SHA1 Message Date
Dean Herbert 98c22e8111 Merge branch 'master' into master 2017-09-22 15:19:23 +08:00
gabixdev 8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
Dean Herbert 096f53d769 Use new static IsDebug method 2017-09-19 16:07:00 +09:00
Dean Herbert 6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
gabixdev e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
MrTheMake 1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
Dan Balasescu 77d2b1e478 Merge branch 'master' into more_context_menus 2017-09-14 19:21:29 +09:00
Dean Herbert 7cd6caacaa Update to support newer return structure from osu-web API 2017-09-14 18:08:12 +09:00
Dean Herbert b7c9819680 Add context menus to chat names and user panels 2017-09-14 15:43:47 +09:00
Dean Herbert b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
MrTheMake 89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert f4f7ae12b3 Merge branch 'master' into channelselection-minimum-size 2017-09-13 15:40:22 +09:00
Dean Herbert 7681d97f10 Fix typo in user profile header 
Replays watched, not replay watched.
 2017-09-13 15:21:04 +09:00
Dean Herbert 7835269f95 Merge branch 'master' into channelselection-minimum-size 2017-09-13 14:21:44 +09:00
MrTheMake a30bd90641 Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size 2017-09-12 18:48:11 +02:00
MrTheMake 9839a3b937 Smoothly transform the chat height when opening the channel selection 2017-09-12 18:47:21 +02:00
MrTheMake c78695cfe0 Removed redundant call 2017-09-12 18:26:52 +02:00
smoogipooo 58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 15:02:12 +09:00
Dean Herbert 8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
smoogipooo cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 02:42:23 +09:00
naoey 0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
naoey e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
naoey 20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
naoey 5a3814b02e
XMLdoc fixes and a cautionary check. 2017-09-09 01:04:55 +05:30
naoey 0e4973020a
Resharper and test case fixes. 2017-09-09 00:58:54 +05:30
naoey 00306b6e38
Maintain download progress between switching result views. 
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
 2017-09-09 00:57:48 +05:30
naoey 31a507372a
Don't show beatmaps that are already added. 2017-09-09 00:57:48 +05:30
naoey 20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
Dean Herbert 386147cc77 Merge branch 'master' into channelselection-minimum-size 2017-09-09 02:51:47 +09:00
MrTheMake 15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
MrTheMake 5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
smoogipooo 19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert e5308b6247 Method rename 2017-09-06 23:12:32 +09:00
Dean Herbert da294c9605 Don't use base call when we don't have to 2017-09-06 23:10:08 +09:00
Dean Herbert 4f49a0c183 Simplify action 2017-09-06 22:58:21 +09:00
Dean Herbert a7fa66b9f9 Fix CI issue 2017-09-06 22:41:03 +09:00
Dean Herbert 940c45b6d1 Fix visual styling and code styling 2017-09-06 21:43:20 +09:00
Dean Herbert c6fa899b15 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-09-06 21:43:03 +09:00
smoogipooo 5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo 1904b5edfe Only store native position instead of input state. 2017-09-05 10:38:19 +09:00
smoogipooo e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +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 57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00