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

777 Commits

Author SHA1 Message Date
Dean Herbert
51506efd1a Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-31 16:49:31 +09:00
Dean Herbert
ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4 Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning 2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9 Minor formatting fixes 2018-07-31 16:13:52 +09:00
Dean Herbert
132241424d Apply FollowPoint alpha to inner container (should not affect legacy skins) 2018-07-31 15:59:06 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size 2018-07-31 15:41:15 +09:00
Dean Herbert
a98bb057e2 Fix follow circle being scaled far larger than it should be 2018-07-31 15:27:21 +09:00
tgi74000
36afae5a24 Remove the inner followcircle fade, Fade the entire followcircle instead 2018-07-30 13:43:02 +02:00
Dean Herbert
21f3ff6e77 Fix slider repeat points appearing far too late 2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6 Improve rotation handling in edge cases 2018-07-30 18:50:59 +09:00
tgi74000
c6aabc6d2d Move the FollowCircle border to its own container 2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762 Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-30 17:29:21 +09:00
tgi74000
84135c49ca Fix small FollowPoint rotation bug 2018-07-29 23:21:05 +02:00
tgi74000
18096490b6 Add support for followpoint skinning 2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2 Add support for sliderb skinning (single frame only) 2018-07-29 22:29:07 +02:00
tgi74000
257c035f30 Add support for sliderfollowcircle skinning 2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03 Add support for reversearrow skinning 2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128 Add support for sliderscorepoint skinning 2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92 Fix hitobjects not properly expiring if scrolling in the editor 2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954 Add interpolation to repeat point during sliding 2018-07-23 16:55:38 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display 2018-07-20 17:29:15 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
Dean Herbert
ffd3040fe2 Fix GameplayCursor state not restoring correctly after Show/Hide 2018-07-18 19:59:04 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
smoogipoo
2d8e2dc5f7 Merge remote-tracking branch 'origin/master' into osu-default-bindings 2018-07-13 19:32:40 +09:00
Ethan Yang
157ca8b2a4 Change osu key bindings 2018-07-08 11:47:39 -07:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
Dean Herbert
831b11ff97 Remove unnecessary null checks 2018-07-02 14:28:56 +09:00
Dean Herbert
c04bfb96e1 Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix 2018-07-02 14:26:41 +09:00
Dean Herbert
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring 2018-06-29 17:16:14 +09:00
Dean Herbert
c0b65a6a73 Change default IsBonus definition and remove unnecessary overrides 2018-06-29 17:07:08 +09:00
Dean Herbert
cacabeb67e Remove unused field 2018-06-29 17:00:41 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
smoogipoo
756cabd5d0 Add a preprocess method to BeatmapProcessor 2018-06-29 12:45:48 +09:00
Dean Herbert
9d4bc7b630 Fix combo index being wrong 2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709 Check whether initialised first 2018-06-28 22:44:40 +09:00
Dean Herbert
e197ebe4c5 Fix slider heads displaying in incorrect colour 2018-06-28 01:55:09 +09:00
Dean Herbert
10220a61a5 Use playfield size constants where possible 2018-06-27 12:18:00 +09:00
smoogipoo
0e6cc78d9a Add slider ticks conversion test 2018-06-27 12:09:40 +09:00
smoogipoo
6f65ad33f0 Output one value per slider nested hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
0366b0f081 The tail circle will always be the last hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Roman Kapustin
2a72062c33 Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part. 2018-06-26 00:53:31 +03:00