1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 18:47:25 +08:00
Commit Graph

9956 Commits

Author SHA1 Message Date
smoogipoo
c32ff9c43b Move nested playfields to the base Playfield 2018-01-15 20:39:57 +09:00
Dean Herbert
96242234c0
Merge pull request #1910 from smoogipoo/fix-alljudged-usages
Fix a few usages of AllJudged possibly not being correct
2018-01-15 16:49:42 +09:00
Dean Herbert
20923321ad
Merge branch 'master' into fix-alljudged-usages 2018-01-15 16:39:16 +09:00
Dean Herbert
263ffaac3f
Merge pull request #1887 from smoogipoo/fix-skipbutton-ordering
Improve game-wide cursor visualisation handling
2018-01-15 16:29:31 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
bfdfb52666 Fix a few usages of AllJudged possibly not being correct 2018-01-15 15:28:08 +09:00
smoogipoo
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
smoogipoo
43f8a8e8c5 Rename OsuCursorVisualiser -> CursorOverrideContainer 2018-01-15 14:00:13 +09:00
Dan Balasescu
25d4445543
Merge pull request #1902 from Aergwyn/expose-ishit
Expose "IsHit" on DrawableHitObject
2018-01-14 00:35:21 +09:00
Aergwyn
8ac6818639 expose IsHit 2018-01-13 16:26:14 +01:00
Dan Balasescu
a9d7eac8be
Merge pull request #1899 from Aergwyn/shrink-drawablehitobject_t
Slim down DrawableHitObject<T>
2018-01-14 00:24:52 +09:00
Dan Balasescu
ebb8550f53
Merge branch 'master' into shrink-drawablehitobject_t 2018-01-14 00:16:42 +09:00
Aergwyn
7875f0cb01 remove unnecessary internal 2018-01-13 16:15:41 +01:00
Dan Balasescu
093db77c62
Merge pull request #1894 from Aergwyn/remove-empty-lines
Remove unnecessary empty lines
2018-01-14 00:13:50 +09:00
Aergwyn
356bb5da1e move sample logic up too 2018-01-13 12:55:52 +01:00
Aergwyn
70fc09f81e move judgement + state logic up to DrawableHitObject 2018-01-13 12:42:42 +01:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
b9f4dee801
Merge pull request #1893 from Aergwyn/preview-volume
Remove volume reduction on song preview
2018-01-13 02:52:56 +09:00
Dean Herbert
2507ec2ef8
Merge branch 'master' into preview-volume 2018-01-13 02:32:46 +09:00
Dean Herbert
7ecb49c1f9
Merge pull request #1889 from peppy/catch-overall-fixing
Fixes to catching fruit
2018-01-13 01:18:17 +09:00
Aergwyn
1c5b3d009c remove volume reduction on preview
it doubles with global reduction
2018-01-12 17:09:57 +01:00
Dean Herbert
b4b15b7dd0 Apply review fixes 2018-01-13 00:51:20 +09:00
Dean Herbert
9e10854840 Fix banannanananana showers not exploding enough 2018-01-12 22:30:35 +09:00
Dean Herbert
7b19353ed8 Fix weird fruit not fading out 2018-01-12 22:30:35 +09:00
Dean Herbert
f03b8206da Make banana showers always last in combo (explodey) 2018-01-12 22:30:35 +09:00
Dean Herbert
20c6f84efa Fix banana test regression 2018-01-12 22:30:35 +09:00
Dean Herbert
93c4d58b69 Make catch plate fruit again 2018-01-12 22:30:35 +09:00
Dan Balasescu
4ef23a8ee8
Merge pull request #1884 from peppy/catch-autoplay
Add very basic osu!catch replay/autoplay handling
2018-01-12 20:58:41 +09:00
smoogipoo
90bcec42d7 Remove unused using 2018-01-12 20:48:58 +09:00
Dan Balasescu
4d26c8c311
Merge branch 'master' into catch-autoplay 2018-01-12 20:26:11 +09:00
Dan Balasescu
56e4212883
Merge branch 'master' into catch-autoplay 2018-01-12 20:25:24 +09:00
Dean Herbert
f918bfa11b
Merge pull request #1885 from peppy/catch-banana-shower
Add osu!catch banana showers
2018-01-12 20:22:53 +09:00
Dan Balasescu
d9c47f98a8
Merge branch 'master' into catch-banana-shower 2018-01-12 20:00:00 +09:00
Dan Balasescu
65c7882ea2
Merge pull request #1886 from peppy/fix-catch-stream-colours
Fix juice streams not propagating accent colours to nested objects
2018-01-12 19:56:15 +09:00
smoogipoo
d0b177e233 Proxying isn't needed anymore 2018-01-12 19:50:09 +09:00
smoogipoo
78441c05cb OsuCursorContainer -> OsuCursorVisualiser 2018-01-12 19:45:09 +09:00
Dean Herbert
7bdedf802c Fix juice streams not propagating accent colours to nested objects 2018-01-12 19:39:56 +09:00
smoogipoo
34aee4fea0 Improve comments 2018-01-12 19:39:35 +09:00
smoogipoo
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
smoogipoo
5952f1e7f1 Adjust transforms for cursor transitions 2018-01-12 19:34:14 +09:00
Dean Herbert
2a0a0e3b48
Merge pull request #1856 from smoogipoo/sliderbar-tooltip-precision
Fix up replay playback speed slider having a different tooltip than the displayed number
2018-01-12 19:08:50 +09:00
Dean Herbert
73aa56a8a7
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-12 18:58:30 +09:00
Dean Herbert
98894f010f Update framework 2018-01-12 18:57:53 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
Dan Balasescu
a526d05ef4
Merge pull request #1883 from peppy/fix-incorrect-conditional
Fix incorrect online conditional check in social browser logic
2018-01-12 18:53:41 +09:00
Dean Herbert
33fdc2c1d6 Add very basic replay handling 2018-01-12 18:35:28 +09:00
Dean Herbert
9e3091bfe9 Change anchors in line with new ScrollingPlayfield implementation
(cherry picked from commit 079827d)
2018-01-12 18:33:41 +09:00
Dean Herbert
3b929ffd21 Make test more useful
(cherry picked from commit 5985115)
2018-01-12 18:33:41 +09:00
Dean Herbert
26fedd7e61 Update in line with upstream changes
(cherry picked from commit 2b6d991)
2018-01-12 18:33:41 +09:00