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

29285 Commits

Author SHA1 Message Date
Dean Herbert
f395ef24a4
Merge branch 'master' into editor-position-snap 2020-05-22 16:42:09 +09:00
Dan Balasescu
10af894b69
Merge pull request #9080 from bdach/sequential-scroll-lifetime-start
Fix display start time in sequential scroll algorithm
2020-05-22 15:17:47 +09:00
Dean Herbert
f364d0e832 Reduce IManiaHitObjectComposer scope 2020-05-22 11:35:26 +09:00
Bartłomiej Dach
6f388b731e Fix display start time in sequential scroll algorithm 2020-05-21 21:56:59 +02:00
Bartłomiej Dach
4299bd05b4 Add test cases for sequential scroll algorithm 2020-05-21 21:56:59 +02:00
Bartłomiej Dach
24d898c870 Demonstrate failure case in visual test scene 2020-05-21 21:56:55 +02:00
Bartłomiej Dach
8702a1b5a5 Fix test scene regression 2020-05-21 20:16:02 +02:00
Dean Herbert
b1fd7da824 Merge branch 'master' into editor-position-snap 2020-05-21 15:47:20 +09:00
Dean Herbert
0db1ea6a9d Fix failing tests 2020-05-21 15:47:12 +09:00
Dean Herbert
7dd3b3eeb5 Remove unused method 2020-05-21 15:16:59 +09:00
Dean Herbert
a756e6d212 Add xmldoc and remove unnecessary parameter 2020-05-21 15:16:30 +09:00
Dean Herbert
ce8b6b7383 Correctly account for blueprint origins 2020-05-21 15:15:24 +09:00
Dean Herbert
776b842fdb Remove unused using 2020-05-21 14:53:36 +09:00
Dean Herbert
a9a1c00cf1 Move responsibility placement blueprint's StartTime set to within 2020-05-21 14:50:33 +09:00
Dan Balasescu
eb2e8e50b9
Merge pull request #9071 from peppy/seek-to-start-not-end
Seek to start of placed object, not end
2020-05-21 14:30:14 +09:00
Dean Herbert
bac78707de Move more logic to column to both clean things up and fix tests 2020-05-21 14:25:37 +09:00
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
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
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
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
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