1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:07:25 +08:00
Commit Graph

9807 Commits

Author SHA1 Message Date
Dean Herbert
8fe319286f
Merge branch 'master' into fix-dotsettings-file 2018-01-08 20:18:24 +09:00
Dean Herbert
bf98c16595
Merge pull request #1865 from Aergwyn/improve-hidden
Minor standard hidden improvements
2018-01-08 09:35:10 +09:00
Aergwyn
54c0197eb0 remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42 remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
Dean Herbert
f660eff4d4 FIx incorrect licence header template 2018-01-07 12:02:42 +09:00
Dean Herbert
8a4ab6c03d
Merge pull request #1862 from FreezyLemon/fix-mania-hitobject-test
Fix TestCaseManiaHitObjects exception on load
2018-01-07 11:37:45 +09:00
FreezyLemon
47f5b23dcf fix child size == 0 exception 2018-01-07 00:53:44 +01:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Aergwyn
82dcb033de update submodules 2018-01-06 10:47:56 +01:00
Aergwyn
57b44b8c29 fix new panels appearing too soon 2018-01-06 10:40:18 +01:00
Aergwyn
140a09ba3d fix requests not cancelling properly + formatting 2018-01-05 19:13:54 +01:00
Dean Herbert
35297f000c
Merge pull request #1857 from peppy/udpate-licence-header
Update licence headers
2018-01-05 20:46:55 +09:00
Dean Herbert
d1f03ebf0c Update in line with framework 2018-01-05 20:29:14 +09:00
Dean Herbert
fd60485dd2 Update submodules 2018-01-05 20:28:38 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
33eaf96bcb
Merge pull request #1847 from ppy/osu/mania-keymods
Implement osu!mania key mods
2018-01-05 14:11:00 +09:00
Dean Herbert
b2e723d288
Merge branch 'master' into mania-keymods 2018-01-05 13:55:20 +09:00
Dean Herbert
8f06f7d72e
Merge pull request #1845 from smoogipoo/mania-rc-cleanup
Cleanup osu!mania's RulesetContainer and Beatmap conversion process
2018-01-05 13:55:05 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
Dean Herbert
c26db17e0b
Merge pull request #1855 from smoogipoo/ci-cleaunps
Cleanup some possible CI errors
2018-01-05 10:00:24 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
Dean Herbert
8c2cc4c85b
Merge pull request #1840 from Aergwyn/fix-slider-follow-circle
Fix slider follow circle instantly disappearing on slider ends
2018-01-04 21:03:14 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust. 2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77 Comment and better stacking of FadeOuts 2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5 Make animation a bit more subtle 2018-01-04 20:43:42 +09:00
Dean Herbert
155e84d2b7 Update framework 2018-01-04 20:24:59 +09:00
james58899
0158246ba1
AppVeyor 2018-01-04 19:23:00 +08:00
Dean Herbert
ffc7f7ecf4 Add a better slider "hit" state fade out animation 2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d Disallow SliderBall from contracting after EndTime 2018-01-04 20:09:58 +09:00
james58899
dcc4e863ab
move variables to StoryboardDecoder 2018-01-04 19:04:52 +08:00
smoogipoo
f569d54958 Local circlesize/od variables 2018-01-04 19:52:29 +09:00
Aergwyn
038fa682f7 Merge branch 'master' into expand-social-tab 2018-01-04 11:49:35 +01:00
Aergwyn
844c428fa7 Updated submodule osu-framework 2018-01-04 11:49:03 +01:00
Aergwyn
bf64b8fc69 added hover effects to panels in social
at least partially QQ
2018-01-04 11:42:50 +01:00
Dean Herbert
22fc9601ee Add back missing code 2018-01-04 18:33:57 +09:00
Dean Herbert
5bd489863c Rename enum 2018-01-04 18:20:23 +09:00
Dean Herbert
f28053b2fc Drop fruit when last in combo is not caught
Also cleans up judgement handling a bit
2018-01-04 18:13:59 +09:00
Dean Herbert
0bbc15d24a Clamp fruit to plate 2018-01-04 17:51:34 +09:00
Dean Herbert
5125abf681 Better plate alignment and stacking logic 2018-01-04 17:27:17 +09:00
Dean Herbert
722cad3674 Caught fruit sit behind plate 2018-01-04 17:25:51 +09:00
Dean Herbert
c8ec27c4de Remove redundant prefix 2018-01-04 16:31:41 +09:00
Dean Herbert
152b846cff Fix incorrect scaling of hitobjects in catch 2018-01-04 16:29:53 +09:00
Dean Herbert
f45752c652 Fix catcher's catchable width being half of what it should 2018-01-04 16:29:39 +09:00
Aergwyn
d0c9d71ee7 fix covers not showing in user panels 2018-01-04 08:15:11 +01:00
Dean Herbert
5310db7990
Merge branch 'master' into fix-slider-follow-circle 2018-01-04 15:42:51 +09:00
Dean Herbert
5253ee5c08 Ignore ruleset test 2018-01-04 15:34:57 +09:00
Dean Herbert
996a72b279 Degrade yearin header 2018-01-04 15:25:12 +09:00
Dean Herbert
ea568f09e0 Merge remote-tracking branch 'upstream/master' into drawable-fruit-improvements 2018-01-04 15:21:40 +09:00