1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

13694 Commits

Author SHA1 Message Date
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
4f5578245e Fix regression causing previews to not play 2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051 Remove unnecessary cache operations 2018-07-13 21:45:42 +09:00
Dean Herbert
ac35e8bd99 Remove redundant empty statement 2018-07-13 21:27:09 +09:00
Dean Herbert
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
Dan Balasescu
d08c44a726
Merge pull request #3030 from peppy/focused-overlay-blocks-select
Make focused overlays block "select" and keys
2018-07-13 21:20:43 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dean Herbert
6d8923a37c Use better logic 2018-07-13 21:08:41 +09:00
Dan Balasescu
ce804461e8
Merge branch 'master' into focused-overlay-blocks-select 2018-07-13 21:06:59 +09:00
Dean Herbert
a1a077398c Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications 2018-07-13 21:04:17 +09:00
Dean Herbert
95f314d949 Fix crash when clicking notification from player 2018-07-13 21:04:10 +09:00
Dean Herbert
b33a0f772e Don't close toolbar 2018-07-13 21:00:52 +09:00
Dean Herbert
7b106bd0c1
Merge pull request #3029 from peppy/fix-informational-overlay-hiding
Fix informational overlays not hiding when user toggles other overlay views
2018-07-13 20:56:01 +09:00
Dean Herbert
67e7e371cc Also block keyboard completely 2018-07-13 20:40:49 +09:00
Dean Herbert
3308f8f823 Fix focused overlays not blocking select action 2018-07-13 20:37:49 +09:00
Dean Herbert
96eb44425b Fix informational overlays not hiding when user toggles other overlay views
Closes #3014.
2018-07-13 20:34:41 +09:00
Dan Balasescu
9d8060d5e0
Merge pull request #2975 from thatprogrammer1/osu-default-bindings
Change osu!standard default key bindings
2018-07-13 20:33:24 +09:00
Dan Balasescu
9153c7ecfb
Merge branch 'master' into osu-default-bindings 2018-07-13 20:23:27 +09:00
Dean Herbert
bbb11a4066 Fix regression in drawable rank first display 2018-07-13 19:53:29 +09:00
Dan Balasescu
eeb6bdef93
Merge pull request #3027 from peppy/remove-migration-notice
Remove migration log output
2018-07-13 19:40:07 +09:00
smoogipoo
2d8e2dc5f7 Merge remote-tracking branch 'origin/master' into osu-default-bindings 2018-07-13 19:32:40 +09:00
Dan Balasescu
6cc0a69413
Merge branch 'master' into remove-migration-notice 2018-07-13 19:31:20 +09:00
Dean Herbert
cd31df7c2e
Merge pull request #2903 from smoogipoo/storyboard-samples
Implement storyboard sample playback
2018-07-13 18:48:05 +09:00
Dean Herbert
4a4272ffbe
Merge pull request #3026 from peppy/improve-difficulty-icons
Improve visuals of difficulty icons
2018-07-13 18:41:22 +09:00
Dean Herbert
c160a61fb7
Merge branch 'master' into storyboard-samples 2018-07-13 18:34:51 +09:00
Dean Herbert
3f44f5c60e Remove migration log output 2018-07-13 18:34:38 +09:00
Dan Balasescu
69acb4f10e
Merge branch 'master' into improve-difficulty-icons 2018-07-13 18:27:43 +09:00
Dan Balasescu
610b23df51
Merge pull request #2987 from peppy/fix-ugly-line
Fix pixel gap in user profile when scrolling
2018-07-13 18:27:30 +09:00
Dean Herbert
2d602c0e3c
Add todo regarding playback skip logic 2018-07-13 18:23:12 +09:00
Dean Herbert
b5a05a13ab
Merge branch 'master' into fix-ugly-line 2018-07-13 18:19:03 +09:00
Dan Balasescu
18d1fbba6f
Merge pull request #2993 from peppy/fix-weird-import-fail
Fix import failure of beatmap sets containing duplicate beatmap difficulties
2018-07-13 18:09:16 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
Dan Balasescu
1a5e77ab40
Merge branch 'master' into fix-weird-import-fail 2018-07-13 17:58:35 +09:00
Dean Herbert
159b26509b Improve visuals of difficulty icons 2018-07-13 17:15:06 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
Criminalllz
a9f8c2acb8 Use Regex to only care about colors and commas when parsing a color. 2018-07-12 20:36:57 +02:00
Dean Herbert
89bf811fad
Merge pull request #3017 from peppy/fix-tooltip-behaviour
Restore old tooltip appear delay behaviour
2018-07-13 00:07:32 +09:00
Dan Balasescu
3a9929d466
Merge branch 'master' into fix-tooltip-behaviour 2018-07-12 23:54:24 +09:00
Dan Balasescu
9d9166d4a6
Merge pull request #3004 from peppy/update-disclaimer
Update disclaimer
2018-07-12 23:54:08 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer 2018-07-12 23:41:55 +09:00
Dean Herbert
4eb0e207b2
Merge branch 'master' into fix-tooltip-behaviour 2018-07-12 20:18:04 +09:00
Dean Herbert
e3747be465
Merge pull request #3001 from ekrctb/fix-key-binding-row
Fix key configuration row sometimes not expanding on click
2018-07-12 20:16:28 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
Dean Herbert
6bcc8d1cbc Update framework 2018-07-12 19:56:41 +09:00
Dean Herbert
68fa6f03f0 Merge remote-tracking branch 'upstream/master' into peppy-fix-tooltip-behaviour 2018-07-12 19:55:24 +09:00
Dean Herbert
0e5f87dcee
Merge pull request #3015 from peppy/fix-osu-logo-handling-buttons
Fix osu! logo handling non-left mouse buttons
2018-07-12 18:10:58 +09:00