1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 01:53:22 +08:00
Commit Graph

9979 Commits

Author SHA1 Message Date
Dean Herbert
02f4705178
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 23:13:30 +09:00
Dean Herbert
95b82a7cdf
Merge pull request #1773 from smoogipoo/autoplay-drumroll-tick-fix
Fix taiko autoplay hitting drumroll ticks with the rims instead of centres
2017-12-27 23:13:09 +09:00
Dean Herbert
84f9a0b6b1
Merge branch 'master' into autoplay-drumroll-tick-fix 2017-12-27 22:59:08 +09:00
Dean Herbert
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 22:58:50 +09:00
Dean Herbert
0d3b11a1a0
Merge pull request #1775 from peppy/fix-progress-notifications-close
Fix progress notifications not creating their completion notification early enough
2017-12-27 22:58:19 +09:00
Dean Herbert
f68bf2e258
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 21:45:20 +09:00
Dan Balasescu
d99c6db4a1
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:44:31 +09:00
Dan Balasescu
48fe47fcaf
Merge pull request #1756 from peppy/better-testcase-player
Make TestCasePlayer more usable
2017-12-27 21:44:12 +09:00
Dean Herbert
3f73a9a693 Add better sample fallback logic
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
Dan Balasescu
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:43:58 +09:00
Dean Herbert
9a4b2f0d1d Apply workaround at two levels 2017-12-27 21:19:06 +09:00
Dean Herbert
3428cf6501 Decrease speed of progress notifications 2017-12-27 21:11:20 +09:00
Dean Herbert
46ef17354e Simplify path construction 2017-12-27 21:05:16 +09:00
smoogipoo
6fe20bb910 Ignore test cases for CI 2017-12-27 20:41:59 +09:00
smoogipoo
1a5cf98e0c Fix repeat points always being placed at end position of th slider
PositionAt is clamped to [0, 1] where 0 denotes the beginning of the curve and 1 denotes the end of the curve. It has no concept of repeats.
2017-12-27 20:40:38 +09:00
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 20:40:16 +09:00
smoogipoo
c18fd5da48 Simplify creation of repeat points 2017-12-27 20:37:28 +09:00
Dean Herbert
edab169024 Update framework 2017-12-27 20:27:20 +09:00
Dean Herbert
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
smoogipoo
5b45d36fef Decomission TestCaseHitObjects 2017-12-27 20:09:33 +09:00
smoogipoo
4c032df677 Move sliderbars to the end of the testcase buttons 2017-12-27 20:08:33 +09:00
smoogipoo
ccaf63a437 Add a Spinner testcase 2017-12-27 20:01:20 +09:00
smoogipoo
fdafc2107e Cleanups + add auto to TestCaseHitCircle 2017-12-27 19:47:55 +09:00
smoogipoo
4d5216da00 Finish up implementation of TestCaseSlider 2017-12-27 19:47:42 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +09:00
smoogipoo
cb18baa4d8 Add HitCircle/Slider testcases 2017-12-27 17:34:07 +09:00
smoogipoo
b87e6c8b2a Add a method to get ruleset by name 2017-12-27 17:33:34 +09:00
smoogipoo
b564215527 Update framework 2017-12-27 17:32:19 +09:00
smoogipoo
ce18a0705d Merge remote-tracking branch 'origin/master' into sliderbouncers-fix 2017-12-27 16:48:04 +09:00
Dan Balasescu
9841fd6cd6
Merge pull request #1745 from peppy/notification-verbosity
Rate limit logged errors displayed as notifications
2017-12-27 15:37:14 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity 2017-12-27 15:01:28 +09:00
Dan Balasescu
14cc40f4a1
Merge pull request #1774 from peppy/fix-multiple-random-selects
Fix random selection happening more than once on quick imports
2017-12-27 15:01:12 +09:00
smoogipoo
b97d0ce050 Update framework 2017-12-27 14:59:45 +09:00
smoogipoo
de353ee6af Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 14:59:26 +09:00
Dan Balasescu
f6e72706d9
Merge branch 'master' into fix-multiple-random-selects 2017-12-27 14:51:54 +09:00
Dean Herbert
7dcd325a91
Merge branch 'master' into autoplay-drumroll-tick-fix 2017-12-27 14:19:25 +09:00
Dean Herbert
b36e5d4d47
Merge pull request #1776 from smoogipoo/update-opentk
Update opentk
2017-12-27 13:59:35 +09:00
smoogipoo
5ad86d2b75 Update framework 2017-12-27 13:50:54 +09:00
Dean Herbert
2a7147240f Fix progress notifications not creating their completion notification early enough
FIxes notification overlay thinking it has no notifications left and closing.
2017-12-27 13:25:42 +09:00
smoogipoo
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
smoogipoo
9fa0cfd250 Fix taiko autoplay hitting drumroll ticks with the rims instead of centres
Fixes #1772.
2017-12-27 13:06:36 +09:00
Dean Herbert
18d2be75d5 Fix random selection happening more than once on quick imports 2017-12-27 13:04:50 +09:00
smoogipoo
ddee9e992a Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds 2017-12-27 13:04:10 +09:00
smoogipoo
519ef72adf Lookup by control point time rather than control point
Under some situations, such as when there are no control points, ControlPointInfo will return to us a newly-constructed controlpoint with every call to SamplePointAt, which will fail on this key lookup.

Between this and overriding GetHashCode, I think this is the more proper fix for this.
2017-12-27 13:03:46 +09:00
Dean Herbert
cf9a9762f7 Fix beatmap wedge appearing with incorrect info on entering song select
Closes #1762
2017-12-27 13:02:21 +09:00
smoogipoo
b95d7fc2cd Revert "Make ControlPointInfo return a set default control point"
This reverts commit 3113a55a98.
2017-12-27 12:41:59 +09:00
Dan Balasescu
c445291be7
Merge pull request #1770 from peppy/fix-play-no-beatmap
Fix crash when starting play mode with no beatmap
2017-12-27 12:30:58 +09:00
Dean Herbert
ae9f08f387 Fix crash in editor when trying to seek on a virtual track 2017-12-27 11:47:04 +09:00
Dean Herbert
d17f6cb564 Fix crash when starting play mode with no beatmap
Closes #1767
2017-12-27 11:46:44 +09:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00