1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

3913 Commits

Author SHA1 Message Date
Dean Herbert
1d1b291efc Merge branch 'master' into sliderbar-improvements 2017-04-12 20:04:36 +09:00
Dan Balasescu
c20f8f5e8e Merge pull request #625 from peppy/dependency-updates
Update nuget packages.
2017-04-12 20:04:00 +09:00
ocboogie
6c6ef946bd Some more clean up 2017-04-12 04:01:52 -07:00
Dan Balasescu
ce269eaebb Merge branch 'master' into dependency-updates 2017-04-12 19:56:18 +09:00
Dean Herbert
ec6267c5b2
switch -> if. 2017-04-12 19:41:11 +09:00
Dean Herbert
c0338a82e7
Update nuget packages.
Includes fix in OpenTK for focus issues.
2017-04-12 19:35:16 +09:00
ocboogie
d250dde537 Fixed repeat keys working for retrying 2017-04-12 02:50:03 -07:00
ocboogie
348dd71406 Fixed repeat keys working for resuming 2017-04-12 02:43:42 -07:00
Jorolf
98ce9e0724 remove ?? 2017-04-12 11:25:32 +02:00
Jorolf
e285d33f8c fails, retries and size not enforced 2017-04-12 11:05:10 +02:00
Jorolf
d2affe6867 requested changes 2017-04-12 10:52:24 +02:00
ocboogie
8cad09370d Fixed pause and fail screen overlap 2017-04-12 00:20:41 -07:00
Dean Herbert
5676541173 Merge pull request #623 from smoogipooo/general-fixes
General fixes
2017-04-12 15:19:21 +09:00
Dan Balasescu
6ab274abc0 Trim whitespace 2017-04-12 15:06:46 +09:00
smoogipooo
f8076ec792 Better comment. 2017-04-12 15:04:11 +09:00
smoogipooo
50a598dd05 Revert another masking container. 2017-04-12 15:01:54 +09:00
smoogipooo
32c3e34eb7 Revert "Better masking."
This reverts commit 5d5040ee73.
2017-04-12 15:00:26 +09:00
smoogipooo
7a24e5f509 Revert "Implement proper masking support for taiko hit objects."
This reverts commit 4e2ae72126.
2017-04-12 15:00:18 +09:00
smoogipooo
5d5040ee73 Better masking. 2017-04-12 14:34:49 +09:00
smoogipooo
04baa9eb72 Reset stage to normal height after tests. 2017-04-12 12:45:07 +09:00
smoogipooo
0c90ef79fa Make TestCaseTaikoPlayfield work again. 2017-04-12 12:37:02 +09:00
Dean Herbert
9eb4802e83 Merge pull request #621 from ColdVolcano/better-beatmap-search
Match stable search parameters when searching beatmaps
2017-04-12 12:12:04 +09:00
Dean Herbert
2964c04c14
Add special SliderBar sound behaviour when at extents. 2017-04-12 12:07:29 +09:00
Dean Herbert
d6fa51dc5c
Update SliderBar to use OnUserChange method. 2017-04-12 12:07:27 +09:00
smoogipooo
a922e67754 Because Ruleset only exposes HitRenderer, we need to have AspectAdjust in the base class. 2017-04-12 12:06:56 +09:00
smoogipooo
4e2ae72126 Implement proper masking support for taiko hit objects. 2017-04-12 12:06:52 +09:00
Dean Herbert
ca1fb81ff5 Merge pull request #620 from Poliwrath/master
Small fix to the chat overlay to prevent crashing on the test
2017-04-12 10:45:21 +09:00
Poliwrath
dffdb100ab Small fix to the chat overlay to prevent crashing on the test 2017-04-11 21:35:49 -04:00
ColdVolcano
50cb9e0fe7 Match stable search parameters 2017-04-11 18:07:54 -05:00
Jorolf
ed2f5d210e condensed some commits because they were small or already reversed 2017-04-11 22:48:53 +02:00
Jorolf
50b6bcd574 Merge branch 'master' into details 2017-04-11 19:06:58 +02:00
Jorolf
d4e5f55091 the power of linq 2017-04-11 18:43:48 +02:00
Dan Balasescu
34cfeb77e8 Merge pull request #617 from peppy/leaderboard-api
Move API lookup from BeatmapDetailArea to Leaderboard.
2017-04-12 00:28:07 +09:00
Dan Balasescu
3b60ca3c1c Merge branch 'master' into leaderboard-api 2017-04-12 00:14:24 +09:00
Dan Balasescu
927143ae3a Merge pull request #618 from peppy/general-fixes
General fixes
2017-04-12 00:13:59 +09:00
Dan Balasescu
bc98e53aff I helped. 2017-04-12 00:09:45 +09:00
Dean Herbert
a1aed44f10 Fix health not being calculated in osu! mode (regression). 2017-04-12 00:05:21 +09:00
Dean Herbert
f64af9bce3 Update framework. 2017-04-11 23:59:08 +09:00
Jorolf
9026880495 fix 2017-04-11 14:40:12 +02:00
Jorolf
9dd8920c2c 🤔 I hope this works 2017-04-11 14:22:13 +02:00
Jorolf
bfebba3a20 null reference fixes 2017-04-11 14:12:23 +02:00
Jorolf
fb5952186c changes and fixes 2017-04-11 14:02:56 +02:00
Dean Herbert
1a1607aaaa
Improve the look of the transition on hotkey retry (and retry in general). 2017-04-11 19:58:57 +09:00
Dean Herbert
9e6fa965b2
TestCasePlayer doesn't need a PlayerLoader. 2017-04-11 19:38:03 +09:00
Dean Herbert
1a2db87668
Fix osu! mode adding combos twice. 2017-04-11 19:22:56 +09:00
Dean Herbert
2bb50ff082
Add commas to score counter. 2017-04-11 19:21:05 +09:00
Dean Herbert
3aefd50239
Fix osu! mode adding combos twice. 2017-04-11 19:19:54 +09:00
Dean Herbert
c615762da6
wip 2017-04-11 18:56:25 +09:00
Dean Herbert
7d7bea7198
Fix crash on restart after update.
Also make update process more graceful.
2017-04-11 18:40:39 +09:00
Dean Herbert
9732110bd9
Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00