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

29777 Commits

Author SHA1 Message Date
Dean Herbert
0997886df6
Merge pull request #9075 from peppy/silence-on-seek
Silence hitsounds during seek operations
2020-05-21 13:54:26 +09:00
Dan Balasescu
669d9231db
Merge branch 'master' into seek-to-start-not-end 2020-05-21 13:41:57 +09:00
Dean Herbert
5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
Dean Herbert
922b793a5a Update hit object composer tests 2020-05-21 13:04:35 +09:00
Dan Balasescu
fbe76e4f16
Merge branch 'master' into silence-on-seek 2020-05-21 12:55:44 +09:00
Dan Balasescu
8c6f5d2933
Merge pull request #9068 from peppy/skinnable-sound-drawable-sample
Use DrawableSample in SkinnableSound class
2020-05-21 12:54:51 +09:00
Dean Herbert
94bb59db0d Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-21 12:50:49 +09:00
smoogipoo
6d29ff0928 Fix banana showers not using cancellation token 2020-05-21 12:13:02 +09:00
Dean Herbert
83a5913b8d Undo beat snapping related changes 2020-05-21 12:12:21 +09:00
Dean Herbert
ea45637b02 Merge branch 'master' into mania-distance-snap-grid 2020-05-21 12:02:26 +09:00
Dean Herbert
c0e68f9854 Also support taiko drum 2020-05-21 11:08:06 +09:00
Dean Herbert
ce223a2bd8 Silence hit sounds while seeking 2020-05-21 11:08:06 +09:00
smoogipoo
acba1f3ad6 Integrate score panel list into results screen 2020-05-20 23:46:54 +09:00
smoogipoo
1b8d657ead Implement score panel list 2020-05-20 23:46:47 +09:00
Dean Herbert
e09a1bf546 Only seek forwards if not already beyond the placed object 2020-05-20 21:50:52 +09:00
Dean Herbert
b5a7023312 Seek to start time after placement, not end 2020-05-20 21:46:52 +09:00
Dean Herbert
69db62b78a Combine implementation of time-to-position lookup 2020-05-20 21:42:21 +09:00
Dean Herbert
63b5f1a376 Remove unnecessary IRequireHighFrequencyMousePosition 2020-05-20 21:14:20 +09:00
Dean Herbert
e3cec9cf6c Simplify column assignment 2020-05-20 21:13:08 +09:00
Dean Herbert
7c9fbb6fcf Split out classes 2020-05-20 21:03:03 +09:00
Dean Herbert
19e2da9c73 Fix down scrolling giving incorrect positioning data 2020-05-20 21:01:29 +09:00
Dean Herbert
26fb779f4d Move remaining positioning logic local to hold note blueprint 2020-05-20 21:01:29 +09:00
Dean Herbert
2f78866dfb Move positioning out of mania blueprints 2020-05-20 21:01:29 +09:00
Dean Herbert
62092e3f5b Propagate mania column in SnapResult 2020-05-20 21:01:29 +09:00
Dean Herbert
82d6549161 Pass down snap result and remove local TimeAt usage 2020-05-20 21:01:29 +09:00
Dean Herbert
970bd86d2e Remove local TimeAt usage in mania placement 2020-05-20 21:01:29 +09:00
Dean Herbert
23bf0d000e Implement mania beat snapping support 2020-05-20 21:01:19 +09:00
Dean Herbert
ffb8d48fc3 Fix osu!mania editor placement regressions 2020-05-20 21:01:03 +09:00
Dean Herbert
c46bfc2532 Create SnapResult class to hold various snapping results 2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38 Change snapping to be screen space coordinate based 2020-05-20 21:00:29 +09:00
Dean Herbert
c2697d3907 Use DrawableSample in SkinnableSound class 2020-05-20 20:49:01 +09:00
Dan Balasescu
d2350aba24
Merge pull request #9064 from bdach/storyboard-overlay-layer
Add support for storyboard overlay layer
2020-05-20 16:41:31 +09:00
smoogipoo
e5de382760 Merge branch 'master' into storyboard-overlay-layer 2020-05-20 15:08:45 +09:00
smoogipoo
85088c9b3b Privatise setter 2020-05-20 15:08:33 +09:00
Dean Herbert
0bc3073d49 Fix test failures 2020-05-20 15:01:32 +09:00
Dean Herbert
d31a59b074 Fix logic results in infinite loop on default timing point return 2020-05-20 14:55:36 +09:00
Dan Balasescu
b6c9a50f7a
Merge pull request #9057 from peppy/fix-taiko-whistle
Fix taiko rim markers incorrectly playing as whistle samples
2020-05-20 14:24:01 +09:00
Dean Herbert
4f83bb679b Merge branch 'master' into mania-distance-snap-grid 2020-05-20 11:44:19 +09:00
Dean Herbert
b691511737
Merge branch 'master' into fix-taiko-whistle 2020-05-20 10:14:39 +09:00
Dean Herbert
76080368e9 Mark test as headless 2020-05-20 10:14:08 +09:00
Dean Herbert
9638064741 Tidy up ruleset assignment code 2020-05-20 10:06:23 +09:00
Bartłomiej Dach
ce4301c5b8 Add overlay layer to player by proxying 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
2398f2e537 Expose drawable overlay layer 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
6e27247cdf Adjust storyboard decoder test in line with changes 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
e211785704 Add overlay layer to storyboard definition 2020-05-19 19:47:45 +02:00
Dan Balasescu
a7ff7fae90
Merge pull request #9062 from peppy/fix-outwards-event-bindings
Convert dangerous events to IBindables
2020-05-20 02:17:19 +09:00
Dan Balasescu
a075529f93
Merge branch 'master' into fix-outwards-event-bindings 2020-05-20 00:07:30 +09:00
Dean Herbert
da8729e6bd Update framework 2020-05-19 23:28:42 +09:00
Dean Herbert
db4e3047dd Add test for final sample output 2020-05-19 23:28:13 +09:00
Dean Herbert
dabf782a23
Merge branch 'master' into fix-taiko-whistle 2020-05-19 23:08:11 +09:00