Commit Graph

4593 Commits

Author SHA1 Message Date
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
naoey
0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
naoey
d12a5e927a Rename property. 2017-09-09 11:03:25 +05:30
naoey
e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
naoey
5f5dd54f9d Use a List instead of a Dictionary. 2017-09-09 09:56:01 +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
MrTheMake
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
Dean Herbert
9b790157d8 Merge branch 'master' into non-null-beatmap 2017-09-08 23:33:03 +09:00
Dan Balasescu
3166394a59 Merge branch 'master' into home-hides-overlays 2017-09-08 23:23:20 +09:00
MrTheMake
0b1403683b Moved OnlineScore inside GetScoresRequest.cs 2017-09-08 12:21:35 +02:00
MrTheMake
526ee107b8 Use a method to apply a beatmap, its ruleset and the mods. 2017-09-08 12:17:16 +02:00
Dean Herbert
a528173943 Ensure that WorkingBeatmap's Beatmap is never null
Also ensures some extra fields inside Beatmap have non-null defaults.
2017-09-08 19:05:14 +09:00
Dean Herbert
80c35801a6 Hide all overlays when home button is pressed 2017-09-08 16:18:57 +09:00
MrTheMake
01553fc9ef Moved all online related score parsing to its class 2017-09-08 02:46:54 +02:00
MrTheMake
e71f907f89 CI fix 2017-09-07 18:36:16 +02:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
MrTheMake
709aa1ed3d Moved all online score related parsing to its own class 2017-09-07 18:20:14 +02:00
Dean Herbert
b9bec6a983 CI fixes 2017-09-07 23:06:35 +09:00
Dean Herbert
b135dc1f18 Merge remote-tracking branch 'upstream/master' into menu-bar 2017-09-07 22:58:41 +09:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6 Changes in line with framework 2017-09-07 20:36:32 +09:00
smoogipooo
871ca7520f Merge remote-tracking branch 'origin/master' into menu-bar 2017-09-07 15:32:01 +09:00
naoey
69ff4bfa46
Fix startup crash on mono. 2017-09-06 20:04:21 +05:30
Dean Herbert
13c3ef65a8 Merge branch 'master' into fix-mania-input 2017-09-06 23:18:23 +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
06fac913bf Re-implement EditorMenuBar. 2017-09-06 21:14:29 +09:00
Dean Herbert
e834e0e958 Fix incorrect initialisation order causing mania key bindings to not work 2017-09-06 21:07:57 +09:00
Dean Herbert
4f4b0a1f35 Allow posting to chat in all channels 2017-09-06 20:26:01 +09:00
smoogipooo
df79d8918d Merge branch 'master' into menu-bar 2017-09-06 18:26:18 +09:00
Dean Herbert
968c61902a Merge branch 'master' into new-menus 2017-09-05 23:42:33 +09:00
Tom
05f5dfba81 Change difficulty colors and add ExpertPlus
ExpertPlus is for beatmaps above 6.75*
2017-09-05 13:57:30 +02:00
smoogipooo
b871323ed8 Fix BeatmapGroup initialization not correctly setting panels to Hidden. 2017-09-05 19:26:28 +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