1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 01:57:48 +08:00
Commit Graph

13528 Commits

Author SHA1 Message Date
HoutarouOreki
3c1e445fdf Header3 2018-07-17 18:32:11 +02:00
HoutarouOreki
b4bb97fba8 Header2 2018-07-17 15:01:53 +02:00
HoutarouOreki
be977e2541 Header1 2018-07-16 23:50:22 +02:00
Dean Herbert
8e5c93e3ca
Merge pull request #3035 from turbedi/patch-1
Fix KeyCounter counting clicks when game is paused
2018-07-14 12:13:57 +09:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused 2018-07-14 03:08:28 +02:00
Dean Herbert
7c3b0dc919
Merge pull request #2990 from HoutarouOreki/lesserSideKeys
Make arrow keys change settings at the lowest possible intervals
2018-07-14 00:38:48 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +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
Dan Balasescu
ce804461e8
Merge branch 'master' into focused-overlay-blocks-select 2018-07-13 21:06:59 +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
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
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
Dean Herbert
c67e11b2c7 Restore old tooltip appear delay behaviour 2018-07-12 15:27:17 +09:00
Dean Herbert
5df2df9b3a Fix osu! logo handling non-left mouse buttons 2018-07-12 12:36:58 +09:00
Dean Herbert
882a6afecc
Merge pull request #3002 from peppy/change-mac-package-extension
Use zip distribution instead of dmg for mac builds
2018-07-11 21:14:22 +09:00
Dan Balasescu
87d93d0ce6
Merge branch 'master' into change-mac-package-extension 2018-07-11 20:15:06 +09:00
Dan Balasescu
0e88fa3d3f
Merge pull request #3005 from peppy/appveyor-cache-chocolatey
Turn cache back on for chocolatey packages
2018-07-11 20:14:45 +09:00
Dean Herbert
e550b3f52b Turn cache back on for chocolatey packages 2018-07-11 18:25:55 +09:00
Dean Herbert
a03db2e5fd
Merge pull request #2948 from ekrctb/fix-disable-mouse
Fix "disable mouse buttons" not working
2018-07-11 18:04:44 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
96ef526474 Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse 2018-07-11 17:02:01 +09:00