1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 03:57:25 +08:00
Commit Graph

9510 Commits

Author SHA1 Message Date
Dean Herbert
2c61ebbcd9 Remove unnecessary local derived classes 2017-12-29 17:10:33 +09:00
Dean Herbert
b74248a705 Rename application method 2017-12-29 16:22:06 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support 2017-12-29 15:56:38 +09:00
Dean Herbert
936a3f52c8
Merge pull request #1793 from peppy/use-ppy-opentk
Use a non-broken opentk library
2017-12-29 15:54:14 +09:00
Dean Herbert
16c1bc9880 Update framework 2017-12-29 15:43:38 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
Aergwyn
ca650e8d48 extend TestCaseSpinner with new steps
- Hidden, Size and Scale
2017-12-28 18:21:08 +01:00
Aergwyn
8d5f4d4f19 extend TestCaseSlider with new steps
- Hidden, Size and Scale
- made Repeats an SliderStep instead
2017-12-28 18:09:35 +01:00
Aergwyn
cd237da6d3 extend TestCaseHitCircle with new steps
- Hidden, Size and Scale
- also fix Auto still missing because no judgement was created
2017-12-28 17:06:15 +01:00
Aergwyn
0b23ceb781 fix slider fade out to be eased
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Dean Herbert
021717dfb4 Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-28 14:24:10 +09:00
Dean Herbert
8f716212a7
Merge pull request #1785 from FreezyLemon/fix-pause-overlay-selection
Select pause buttons only on mouse move
2017-12-28 14:09:00 +09:00
Dean Herbert
e77dc368ba
Merge branch 'master' into fix-pause-overlay-selection 2017-12-28 14:01:36 +09:00
Dean Herbert
9009fb16d5
Merge pull request #1787 from FreezyLemon/fix-carousel-selectnext-crash
Fix crash on rapid selection at song select
2017-12-28 13:22:16 +09:00
Dean Herbert
e4a8402d3c Use better logic
We need to still perform selection if selectedBeatmap itself is null
2017-12-28 12:38:40 +09:00
FreezyLemon
33480b85c8 fix for Drawables being empty crashing 2017-12-28 03:35:53 +01:00
FreezyLemon
64d99a7560 Fix tests 2017-12-28 02:29:58 +01:00
FreezyLemon
998f9c090d select pause buttons after mouse move only 2017-12-28 01:56:10 +01:00
Aergwyn
5b735a07c2 Updated submodule osu-resources 2017-12-27 21:48:41 +01:00
Aergwyn
dbcf87267d Merge branch 'master' into standard-hd-support 2017-12-27 21:26:39 +01:00
Aergwyn
4c3b4dc5bb Updated submodule osu-framework 2017-12-27 21:26:11 +01:00
Aergwyn
e42fa7205b adjust spinner sequence to the new fadeout speed 2017-12-27 21:23:56 +01:00
Aergwyn
7d29c076d2 fix circles and slider sequences
+ minor cleanup
2017-12-27 21:12:02 +01:00
Dan Balasescu
08e15d63c4
Merge pull request #1780 from peppy/fix-regression
As it turns out, native directory separators are not supported
2017-12-28 01:59:44 +09:00
Dean Herbert
4e6988d21b As it turns out, native directory separators are not supported 2017-12-28 01:05:50 +09:00
Dan Balasescu
ee1baed0e9
Merge pull request #1779 from peppy/fix-regression
Fix regression during merges
2017-12-28 00:50:04 +09:00
Dean Herbert
7a0662da4b Fix regression during merges 2017-12-28 00:38:50 +09:00
Dean Herbert
ce48890559
Merge pull request #1737 from Shawdooow/sliderbouncers-fix
Fix slider repeats playing sample twice
2017-12-28 00:21:28 +09:00
Dean Herbert
18eb74d38c
Merge branch 'master' into sliderbouncers-fix 2017-12-28 00:13:04 +09:00
Dean Herbert
c7f2fe6f72
Merge pull request #1746 from peppy/better-notification-delays
Add a bindable Enabled flag to NotificationManager
2017-12-28 00:12:59 +09:00
Dan Balasescu
dcd994e65b
Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
Dean Herbert
a77fa8cdd3
Merge pull request #1777 from peppy/fix-notification-scheduled-events
Fix notification overlay layout and scheduled tasks being delayed
2017-12-27 23:57:47 +09:00
Dean Herbert
e6876c95ac
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:47:04 +09:00
smoogipoo
7b06c16e70 Display larger hitcircles 2017-12-27 23:44:51 +09:00
Dean Herbert
e7fd9407c1
Merge pull request #1771 from peppy/fix-beatmap-wedge-appear
Fix beatmap wedge appearing with incorrect info on entering song select
2017-12-27 23:29:54 +09:00
Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dean Herbert
259e32f485
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 23:22:06 +09:00
Dean Herbert
718a995297
Merge pull request #1760 from smoogipoo/proper-taiko-hitsounds
Make taiko use taiko-specific hitsounds
2017-12-27 23:21:40 +09:00
Dan Balasescu
790c747fdf
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 23:15:19 +09:00
Dan Balasescu
3a2dadc9d3
Fix spelling error 2017-12-27 23:14:48 +09:00
Dean Herbert
02f4705178
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 23:13:30 +09:00
Dean Herbert
95b82a7cdf
Merge pull request #1773 from smoogipoo/autoplay-drumroll-tick-fix
Fix taiko autoplay hitting drumroll ticks with the rims instead of centres
2017-12-27 23:13:09 +09:00
Dean Herbert
84f9a0b6b1
Merge branch 'master' into autoplay-drumroll-tick-fix 2017-12-27 22:59:08 +09:00
Dean Herbert
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 22:58:50 +09:00
Dean Herbert
0d3b11a1a0
Merge pull request #1775 from peppy/fix-progress-notifications-close
Fix progress notifications not creating their completion notification early enough
2017-12-27 22:58:19 +09:00
Dean Herbert
f68bf2e258
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 21:45:20 +09:00
Dan Balasescu
d99c6db4a1
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:44:31 +09:00
Dan Balasescu
48fe47fcaf
Merge pull request #1756 from peppy/better-testcase-player
Make TestCasePlayer more usable
2017-12-27 21:44:12 +09:00
Dean Herbert
3f73a9a693 Add better sample fallback logic
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00