1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 10:12:54 +08:00
Commit Graph

9767 Commits

Author SHA1 Message Date
Dean Herbert
1a37812d1f
Merge branch 'master' into expand-social-tab 2018-01-10 11:52:08 +09:00
Dean Herbert
77276e3e8e
Merge pull request #1864 from peppy/fix-dotsettings-file
FIx incorrect licence header template
2018-01-10 09:45:15 +09:00
Dan Balasescu
9afd823d6e
Merge branch 'master' into fix-dotsettings-file 2018-01-10 09:35:49 +09:00
Dan Balasescu
d0fd7fe1f4
Merge pull request #1848 from peppy/drawable-fruit-improvements
Improvements to osu!catch visuals
2018-01-10 09:34:49 +09:00
Aergwyn
4ce125478a remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
2018-01-09 19:03:23 +01:00
Aergwyn
44d821172a tidying up 2018-01-09 16:29:12 +01:00
Dean Herbert
c4490b5fe8 Fix incorrect licence header 2018-01-09 22:24:12 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
51513b45eb
Merge branch 'master' into fix-dotsettings-file 2018-01-09 14:32:40 +09:00
Dan Balasescu
96226e1f27
Merge pull request #1870 from peppy/mod-per-file
Move mod implementations to individual files
2018-01-09 14:30:51 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
Dean Herbert
bb57d33239
Merge pull request #1819 from LittleEndu/fix-randomizer
Don't allow randomizer to select invisible maps
2018-01-09 12:52:25 +09:00
Dean Herbert
722eb2515f Improve variable names 2018-01-09 12:44:52 +09:00
Dean Herbert
a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Dean Herbert
cab702cc94
Merge pull request #1854 from james58899/fix-storyboard-variables
Fix storyboard variable parsing
2018-01-09 11:59:53 +09:00
Dean Herbert
4c0259a040
Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
Dean Herbert
e7f9c9f22b
Merge pull request #1869 from Aergwyn/ingame-keybinds
Add skip cutscene as "in game" keybinding
2018-01-09 11:49:32 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Dean Herbert
805e91c625
Merge pull request #1858 from Aergwyn/fix-leaderboard-requests
Fix Leaderboard loading scores multiple times
2018-01-08 20:30:34 +09:00
Dean Herbert
22665337a5
Merge branch 'master' into fix-leaderboard-requests 2018-01-08 20:21:18 +09:00
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