1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-17 00:52:54 +08:00
Commit Graph

9445 Commits

Author SHA1 Message Date
Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
Dean Herbert
718a995297
Merge pull request #1760 from smoogipoo/proper-taiko-hitsounds
Make taiko use taiko-specific hitsounds
2017-12-27 23:21:40 +09:00
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
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
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 20:40:16 +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
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +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
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
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
50bb9d4a01
Merge pull request #1720 from Aergwyn/hide-useless-beatmap-info
Hide unnecessary lines on empty BeatmapInfoWedge
2017-12-26 20:47:30 +09:00
Dean Herbert
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
Dan Balasescu
f6a5f773c4
Merge pull request #1726 from peppy/fix-info-wedge
Fix beatmap info wedge not showing up when zero beatmaps are loaded
2017-12-26 20:16:40 +09:00
Dean Herbert
1c4bcdda96 Fix test race condition
async loads
2017-12-26 20:13:55 +09:00
smoogipoo
d479955e20 Fix spelling error 2017-12-26 20:01:02 +09:00
smoogipoo
0c4e4012f8 Taiko drumroll ticks should just play the playfield samples 2017-12-26 19:57:40 +09:00
smoogipoo
9690591593 Make taiko use namespaced hitsounds
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
Dean Herbert
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
Aergwyn
44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
smoogipoo
c74561b3d4 Add test case for InputDrum 2017-12-26 19:33:28 +09:00
smoogipoo
3113a55a98 Make ControlPointInfo return a set default control point 2017-12-26 19:33:01 +09:00