1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 13:22:55 +08:00
Commit Graph

9794 Commits

Author SHA1 Message Date
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
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +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
Aergwyn
f5d4ed2a22 add interface to adjust DrawableHitObjects 2017-12-26 11:49:42 +01: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
smoogipoo
836d807f4f Give SampleControlPoint a 100% volume by default 2017-12-26 19:32:20 +09:00
Dan Balasescu
2aea729062
Merge pull request #1759 from peppy/quieter-notifications
Fix notification read lamp and notification count
2017-12-26 18:35:25 +09:00
Dan Balasescu
460eeafd32
Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
Dean Herbert
2fb619ed2d
Merge pull request #1733 from smoogipoo/fix-taiko-stronghit
Yet another rework of sound handling in taiko
2017-12-26 18:15:06 +09:00
Dean Herbert
cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit 2017-12-26 18:06:07 +09:00
Dan Balasescu
b7c2461a39
Merge pull request #1742 from peppy/improve-screen-offset
Add special logic to song select to avoid obvious clipping when notifications are displayed
2017-12-26 18:01:28 +09:00
Dan Balasescu
11542b697c
Merge branch 'master' into improve-screen-offset 2017-12-26 17:53:13 +09:00
Dan Balasescu
e65aba83fa
Merge pull request #1749 from peppy/beatmap-import-prompt
Add a dialog offering to import beatmaps from stable
2017-12-26 16:53:45 +09:00
Dean Herbert
3f1ced618a Update framework 2017-12-26 16:15:15 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dean Herbert
f737a64189 Remove ScreenChanged 2017-12-26 16:09:40 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dan Balasescu
678ab2a177
Merge pull request #1748 from peppy/popup-word-wrap
Add word wrapping support for popup dialog text
2017-12-26 15:56:36 +09:00
Dean Herbert
c15b2382a2 Remove unused variable 2017-12-26 15:56:32 +09:00
Dean Herbert
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert
45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00