1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:42:54 +08:00
Commit Graph

6823 Commits

Author SHA1 Message Date
Dean Herbert
c0cf26ed21 Merge branch 'master' into concurrent-overlay-limits 2017-08-25 14:50:45 +09:00
Dean Herbert
66c556f8f9 Merge pull request #1193 from peppy/beatmap-background-disposal-fix
Fix beatmap background being disposed too early
2017-08-25 14:50:34 +09:00
Dan Balasescu
0d7592d9a6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:35:38 +09:00
Dean Herbert
67513177e6 Merge pull request #1192 from peppy/correct-direct-toolbar-icon
Use the correct icon for osu!direct in the toolbar
2017-08-25 13:24:44 +09:00
Dean Herbert
72a16e31dd Remove unnecessary old code 2017-08-25 13:07:10 +09:00
Dan Balasescu
ebf3300cb6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969 Merge branch 'master' into correct-direct-toolbar-icon 2017-08-25 13:05:47 +09:00
Dan Balasescu
b69c099d0f Merge pull request #1191 from peppy/direct-concurrency
Disallow concurrent download
2017-08-25 13:05:34 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d Load direct panels more asynchronously to avoid stutter 2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2 Disallow multiple download requests for the same panel 2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36 Remove downloaded beatmap panels from osu!direct 2017-08-25 11:53:41 +09:00
Dean Herbert
2dd3e51373 Ensure other full-screen overlays are closed when direct is open (and vice-versa) 2017-08-25 10:51:28 +09:00
Dan Balasescu
cf251b70c7 Merge pull request #1184 from peppy/direct-downloads
Add osu!direct download support
2017-08-24 21:52:56 +09:00
Dean Herbert
307c4dd392 Merge branch 'master' into direct-downloads 2017-08-24 21:30:38 +09:00
Dean Herbert
fd72093454 Merge pull request #1182 from peppy/replay-updates
Fix replays not working with new action system
2017-08-24 21:30:20 +09:00
Dean Herbert
febf0348be Permit nulls to allow test cases to run successfully 2017-08-24 21:26:50 +09:00
Dean Herbert
1b0a1dd410 Add missing licence header 2017-08-24 20:37:03 +09:00
Dean Herbert
2b667cf789 Fix typos 2017-08-24 20:32:55 +09:00
Dean Herbert
c9f90efb8a Add more checks and remove direct cast 2017-08-24 20:31:57 +09:00
Dean Herbert
a7e6efd34f Rename keys -> actions 2017-08-24 20:30:18 +09:00
Dean Herbert
0082640548 Add missing licence header 2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dean Herbert
32a23c7fe4 Add initial osu!direct beatmap download and import process 2017-08-24 20:16:03 +09:00
Dean Herbert
9c82593c9e Add cancel event to ProgressNotification 2017-08-24 20:15:45 +09:00
Dean Herbert
3c10b2d3d9 Populate set IDs in GetBeatmapSetsResponse 2017-08-24 20:14:35 +09:00
Dean Herbert
314108146a Add a download API request 2017-08-24 20:14:17 +09:00
Dean Herbert
dac54c362a Update framework 2017-08-24 18:52:29 +09:00
Dean Herbert
cacf256aad Add placeholder download method with progress bar 2017-08-24 18:51:50 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
a2549157ca Add hover effects 2017-08-24 18:18:03 +09:00
Dean Herbert
4e1cf329c8 Move background logic to base class; reduce overdraw after set fades in 2017-08-24 17:39:39 +09:00
Dean Herbert
76a95495d3 Move shared code to base class 2017-08-24 17:30:10 +09:00
Dean Herbert
f0635af40d Add documentation and regions to RulesetInputManager 2017-08-24 15:51:31 +09:00
Dean Herbert
a7a7e0323f Update autoplay and replay handling to result in actions, not keys 2017-08-24 15:36:42 +09:00
Dean Herbert
189988236b Move PlayerInputManager logic inside RulesetInputManager 2017-08-24 15:23:17 +09:00
Dean Herbert
251b325ded Merge pull request #1180 from smoogipooo/mania_reversing
Make ScrollingPlayfield.Reversed protected and make ManiaPlayfield invertible
2017-08-23 22:11:32 +09:00
Dean Herbert
7c3ef81d9c Merge branch 'master' into mania_reversing 2017-08-23 22:02:25 +09:00
Dan Balasescu
babe32be11 Merge pull request #1179 from peppy/reset-to-defaults
Add button to reset default bindings per section
2017-08-23 21:01:28 +09:00
smoogipooo
115e5c95af Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'. 2017-08-23 20:50:03 +09:00
Dean Herbert
c99ed6fd44 Add reset button
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dean Herbert
e9dde822a1 Expose triangles in OsuButton for further customisation 2017-08-23 19:25:40 +09:00
Dean Herbert
17900fea62 Merge pull request #1173 from peppy/fix-incorrect-notification-count
Fix notification count including fading (already closed) notifications
2017-08-23 17:29:58 +09:00
Dan Balasescu
a18507b3b4 Merge branch 'master' into fix-incorrect-notification-count 2017-08-23 17:22:39 +09:00
Dean Herbert
6b6306218e Merge pull request #1177 from smoogipooo/hardrock-flipping
Hardrock flipping
2017-08-23 17:09:15 +09:00
Dean Herbert
1f04995a73 Merge branch 'master' into hardrock-flipping 2017-08-23 17:00:41 +09:00
Dean Herbert
028793e948 Merge pull request #1178 from peppy/headless-ftl
Make OsuTestCases use new non-realtime option
2017-08-23 17:00:08 +09:00
smoogipooo
56292bd7f0 Use constant definition. 2017-08-23 16:54:06 +09:00
Dean Herbert
022063f157 Update framework 2017-08-23 16:51:09 +09:00