1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 05:22:57 +08:00
Commit Graph

13822 Commits

Author SHA1 Message Date
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
HoutarouOreki
1e48582dc2 Instantly hide pause menu for quick retry 2018-07-11 13:49:37 +02: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
Dean Herbert
4638ac902c Remove pointless rate adjust slider from TestCaseOsuGame 2018-07-11 16:31:00 +09:00
Dean Herbert
8bc7c4c9a2 Add TestCase and update disclaimer screen 2018-07-11 16:30:51 +09:00
Dean Herbert
5615a32953 Fix mac installer extension being incorrect 2018-07-11 14:53:40 +09:00
ekrctb
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Dean Herbert
7157428882 Fix import failure of beatmap sets containing duplicate beatmap difficulties 2018-07-11 02:59:00 +09:00
Dean Herbert
1418d1369f Add the ability to click completed download notifications to select beatmap
Closes #2731.
2018-07-11 01:32:10 +09:00
HoutarouOreki
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
Dean Herbert
a36dbc3b93
Merge pull request #2988 from peppy/update-framework
Update framework and other packages
2018-07-10 21:02:33 +09:00
Dean Herbert
2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dan Balasescu
b0d839c5d8
Merge pull request #2986 from peppy/fix-hitsound-fallback
Fix lack of fallback logic for custom bank samples
2018-07-10 17:37:01 +09:00
Dan Balasescu
f5504914cc
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 17:19:16 +09:00
Dan Balasescu
e7f3a3d9cb
Merge pull request #2945 from peppy/improve-button-system
Improve code quality of main menu button system
2018-07-10 17:18:53 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system 2018-07-10 16:44:55 +09:00
Dan Balasescu
2719657976
Merge pull request #2961 from peppy/fix-spelling
Fix some typos and add common custom terms to R# dictionary
2018-07-10 16:43:58 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling 2018-07-10 16:32:14 +09:00
Dan Balasescu
25813ddf22
Merge pull request #2963 from peppy/fix-beatmap-links
Fix links from profile top scores to beatmaps not working correctly
2018-07-10 16:32:01 +09:00
smoogipoo
65d351c31a Fix failing test cases 2018-07-10 16:26:04 +09:00
Dan Balasescu
ce219cda53
Merge branch 'master' into fix-beatmap-links 2018-07-10 16:20:59 +09:00
Dan Balasescu
314cb580f7
Merge pull request #2968 from peppy/generic-update-notifier
Add notification based update path
2018-07-10 16:20:23 +09:00
Dan Balasescu
ab155e511f
Remove commented disable-once 2018-07-10 16:09:18 +09:00
Dan Balasescu
36552478e8
Merge branch 'master' into generic-update-notifier 2018-07-10 16:02:51 +09:00
Dan Balasescu
b3ae460f1b
Merge pull request #2973 from peppy/fix-beatmap-id-conflicts
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
2018-07-10 16:02:35 +09:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dan Balasescu
8cc042bd5a
Merge branch 'master' into fix-beatmap-id-conflicts 2018-07-10 15:49:30 +09:00
Dan Balasescu
b3c9af3553
Merge pull request #2976 from peppy/fix-right-mouse-absolute
Fix right mouse activated absolute scroll not working
2018-07-10 15:49:24 +09:00
Dean Herbert
6dffb1147c
Merge branch 'master' into fix-right-mouse-absolute 2018-07-10 15:34:03 +09:00
Dan Balasescu
ede95b6954
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 15:31:15 +09:00
Dan Balasescu
5ad45b2d42
Merge pull request #2984 from peppy/fix-toolbar-ruleset-selector
Fix toolbar ruleset selector breaking at main menu
2018-07-10 15:31:03 +09:00
Dean Herbert
14c3cc70b1
Prefer namespace lookups first 2018-07-10 15:23:47 +09:00