1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 06:42:54 +08:00
Commit Graph

6488 Commits

Author SHA1 Message Date
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +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
Aergwyn
8ac6818639 expose IsHit 2018-01-13 16:26:14 +01: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
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
Aergwyn
1c5b3d009c remove volume reduction on preview
it doubles with global reduction
2018-01-12 17:09:57 +01: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
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
73aa56a8a7
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-12 18:58:30 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +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
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +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
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
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
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +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
james58899
1985e5bdb2
fix background dim 2018-01-12 12:21:37 +08:00
smoogipoo
4b2d971b00 Add some comments 2018-01-12 13:06:17 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
Dean Herbert
abcfe08f8d Merge remote-tracking branch 'upstream/master' into scrolling-hitobjects-rewrite 2018-01-11 20:38:48 +09:00
smoogipoo
5cfb2c2ffe Make VolumeControlReceptor handle global input
Fixes volume not being able to be changed in dead areas of OverlayContainers.
2018-01-11 19:03:31 +09:00
smoogipoo
c5c33e20bf OverlayContainer changes in-line with framework 2018-01-11 19:03:01 +09:00
Dan Balasescu
86581b6451
Remove extra braces 2018-01-11 17:02:09 +09:00
smoogipoo
ab762045d6 Move back to using load(), fix testcase 2018-01-11 16:51:46 +09:00
smoogipoo
d998936e9e Fix testcase errors 2018-01-11 15:50:44 +09:00
smoogipoo
9ae67b519b Optimise nested hitobject position computations 2018-01-11 15:25:15 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
james58899
4fa038aa27
if not storyboard file 2018-01-11 13:53:41 +08:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
3a869edf36 Add a flag to disable user scroll speed adjustments 2018-01-11 12:44:39 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00