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 |
|
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 |
|
為什麼
|
a1d2b45083
|
Merge branch 'master' into master
|
2018-01-11 22:59:05 +09:00 |
|
Dean Herbert
|
e5f17e3ddb
|
Remove scale from all but palpable fruit
|
2018-01-11 22:36:21 +09:00 |
|
Dean Herbert
|
61062164cb
|
Update framework
|
2018-01-11 21:12:27 +09:00 |
|
Dean Herbert
|
0609fc40de
|
Fix up DrawableJuiceStream/BananaShower
(cherry picked from commit 0bfb3b6)
|
2018-01-11 20:56:09 +09:00 |
|
Dean Herbert
|
66ebe2ee66
|
Change anchors in line with new ScrollingPlayfield implementation
(cherry picked from commit 079827d)
|
2018-01-11 20:55:43 +09:00 |
|
Dean Herbert
|
5b190d3cd2
|
Use correct container type when removing fruit
(cherry picked from commit a2be7f7)
|
2018-01-11 20:55:25 +09:00 |
|
Dean Herbert
|
abcfe08f8d
|
Merge remote-tracking branch 'upstream/master' into scrolling-hitobjects-rewrite
|
2018-01-11 20:38:48 +09:00 |
|
Dean Herbert
|
f6e6701749
|
Merge pull request #1877 from smoogipoo/overlaycontainer-mouse-block
Allow mouse wheel to change volume in overlays
|
2018-01-11 20:28:39 +09:00 |
|
Dean Herbert
|
35c3ee261d
|
Update framework
|
2018-01-11 20:18:46 +09:00 |
|
為什麼
|
a6ecc2897a
|
Merge branch 'master' into master
|
2018-01-11 19:07:46 +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
|
2a983efe0a
|
Merge pull request #1875 from james58899/fix-storyboard
Fix Storyboard not load in osu file
|
2018-01-11 17:10:00 +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
|
428f8b6670
|
Fix up license header
|
2018-01-11 15:08:56 +09:00 |
|