1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 11:57:24 +08:00
Commit Graph

10024 Commits

Author SHA1 Message Date
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
Dean Herbert
5b15073010 Add actual banana conversion/reading
(cherry picked from commit d353158)
2018-01-12 18:33:41 +09:00
Dean Herbert
5c79bdc41c Use switch pattern matching in more places
Also switch access to many classes to public.

(cherry picked from commit 86cc3b7)
2018-01-12 18:33:41 +09:00
Dean Herbert
a36cfd4265 Add BananaShower models and representations
(cherry picked from commit e12e095)
2018-01-12 18:33:41 +09:00
Dean Herbert
1c3c90bac6 Add banana design
(cherry picked from commit 6961ca2)
2018-01-12 18:33:41 +09:00
Dean Herbert
6a9d037c3e
Merge branch 'master' into fix-incorrect-conditional 2018-01-12 18:32:02 +09:00
Dean Herbert
57d02f9b64
Merge pull request #1824 from Shawdooow/approach-rate
Add support for variable approach rate
2018-01-12 18:29:40 +09:00
smoogipoo
a6c6523a86 Make SkipButton an OverlayContainer to use the menu cursor 2018-01-12 18:21:17 +09:00
Dean Herbert
ff725f0e32 Fix incorrect online conditional check in social browser logic 2018-01-12 18:20:46 +09:00
Dean Herbert
8ed24e1bca Update framework 2018-01-12 18:15:53 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert
2bf2cc15d4 Fix unnecessary osu-resources rollback 2018-01-12 18:09:37 +09:00
Dean Herbert
e5056e11f4 Remove extra newline 2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dan Balasescu
ad99d47fd8
Merge pull request #1882 from peppy/fix-mod-implementation-check
Fix some mod interface discrepancies
2018-01-12 17:57:59 +09:00
Dean Herbert
354d781002 Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check 2018-01-12 17:49:31 +09:00
Dean Herbert
b25cd0705d
Merge pull request #1874 from smoogipoo/scrolling-hitobjects-rewrite
Rewrite the way in which HitObjects are scrolled in ScrollingPlayfields
2018-01-12 17:48:39 +09:00
Dean Herbert
b55adf655f Yeah, cinema mod isn't going to work 2018-01-12 17:46:24 +09:00
Dean Herbert
7f189080b9 Move fail override back to abstract implementation 2018-01-12 17:43:56 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:35:24 +09:00
Dean Herbert
260cf59afb
Merge pull request #1740 from ppy/osu/expand-social-tab
Add "Friends" tab to social browser
2018-01-12 17:32:24 +09:00
Dan Balasescu
bb9e89b452
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:31:08 +09:00
Dean Herbert
0a06f8069f Remove panel fade out for now
Should be implemented at one level above using a dedicated container.
2018-01-12 17:22:51 +09:00
smoogipoo
8a04c954a9 Cleanup 2018-01-12 17:19:59 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
smoogipoo
cae93a1d1f Add comment to fade override of holdnote tail 2018-01-12 17:09:39 +09:00
smoogipoo
03824eccc8 Block fadeout on holdnote heads 2018-01-12 17:09:21 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
Dean Herbert
ee23c33422
Merge pull request #1881 from james58899/fix-background-dim
Fix background dim not being applied correctly
2018-01-12 15:53:26 +09:00
james58899
f83c84a0a6
keep BlurTo 2018-01-12 14:24:42 +08:00
Dean Herbert
9a77005d2e Make sure unimplemented auto mods aren't consumable 2018-01-12 14:26:23 +09:00
Dean Herbert
057efa24c7 Move a few interfaces to base classes 2018-01-12 14:26:09 +09:00
james58899
61c8fd4ab9
useless using 2018-01-12 12:39:32 +08:00
smoogipoo
2e235660ad Fix skip button appearing below osu!mania's stage 2018-01-12 13:25:49 +09:00