1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 14:27:31 +08:00
Commit Graph

7038 Commits

Author SHA1 Message Date
smoogipooo
4d77a81e40 Make TestCaseManiaHitObjects work again. 2017-09-11 03:50:16 +09:00
smoogipooo
e876efcc02 Merge branch 'blending-equations' into mania-holdnote-niceness 2017-09-11 03:49:17 +09:00
smoogipooo
af07d5cc51 Update framework. 2017-09-11 03:37:13 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
7d4ca40965 Merge pull request #1219 from naoey/fix-mono-crash
Fix startup crash on mono.
2017-09-10 11:58:58 +09:00
Dean Herbert
0a9ca8a1ff Update framework 2017-09-10 11:53:47 +09:00
Dean Herbert
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
Dean Herbert
f5b3afbe10 Merge pull request #1228 from naoey/direct-upgrades
Direct results maintain download status between switching views
2017-09-09 18:00:11 +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
Dean Herbert
4dc67ed796 Merge pull request #1226 from MrTheMake/channelsection-initial-appearance
Fix wrong initial topic color of not joined channels in the channel selection
2017-09-09 02:44:36 +09:00
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
6b3b012960 Merge pull request #1225 from peppy/non-null-beatmap
Ensure that WorkingBeatmap's Beatmap is never null
2017-09-08 23:43:32 +09:00
Dean Herbert
9b790157d8 Merge branch 'master' into non-null-beatmap 2017-09-08 23:33:03 +09:00
Dean Herbert
a769b94aa8 Merge pull request #1223 from peppy/home-hides-overlays
Hide all overlays when home button is pressed
2017-09-08 23:32:50 +09:00
Dean Herbert
7b497c0ecb Update framework 2017-09-08 23:24:47 +09:00
Dan Balasescu
3166394a59 Merge branch 'master' into home-hides-overlays 2017-09-08 23:23:20 +09:00
Dean Herbert
c0d7a257ee Merge pull request #1103 from MrTheMake/leaderboard-scores
Parse and show the mods of online leaderboards' scores
2017-09-08 21:51:51 +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
c2b16dae10 Merge pull request #1183 from smoogipooo/menu-bar
Implement EditorMenuBar inside a test case
2017-09-07 23:41:21 +09:00
Dean Herbert
439cbd09a0 Fix incorrect TestCase type 2017-09-07 23:28:34 +09: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
Dean Herbert
d4ae567f6c Merge pull request #1220 from smoogipooo/mania-niceness
Make osu!mania columns not progressively light up more
2017-09-07 22:56:40 +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
b085208d24 Remove unused code 2017-09-07 16:15:33 +09:00
smoogipooo
ef9b87e8c7 Make column lights not increase in brightness when successfully pressed 2017-09-07 16:15:25 +09:00
smoogipooo
b98346c79f Update framework. 2017-09-07 15:32:28 +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
70e3ac30db Merge pull request #1217 from peppy/fix-mania-input
Fix incorrect initialisation order causing mania key bindings to not work
2017-09-06 23:30:03 +09:00
Dean Herbert
13c3ef65a8 Merge branch 'master' into fix-mania-input 2017-09-06 23:18:23 +09:00
Dean Herbert
c9e41e4b6f Merge pull request #1120 from naoey/quit-chat-channels
Add close button to chat channel tabs
2017-09-06 23:18:06 +09:00
Dean Herbert
e5308b6247 Method rename 2017-09-06 23:12:32 +09:00