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

13238 Commits

Author SHA1 Message Date
Dean Herbert
fccd4f965c Merge remote-tracking branch 'upstream/master' into make-loading-more-visible 2018-06-22 14:21:01 +09:00
Dean Herbert
155db6969a
Merge pull request #2744 from peppy/improve-volume-controls
Improve UX of volume controls
2018-06-22 13:51:18 +09:00
Dean Herbert
99cc406b97
Merge branch 'master' into improve-volume-controls 2018-06-22 13:39:48 +09:00
Dan Balasescu
0616107b21
Merge pull request #2815 from peppy/api-offline-early-return
Avoid errors being logged when importing beatmaps while logged out
2018-06-22 13:36:15 +09:00
smoogipoo
8d3c2d54f3 Merge remote-tracking branch 'origin/master' into improve-volume-controls 2018-06-22 13:33:07 +09:00
smoogipoo
67a067ffa5 Fix overlay not disappearing when losing hover from the last pixel
OnMouseMove isn't invoked when hover is lost.
2018-06-22 13:32:32 +09:00
smoogipoo
72aee8344e Always call schedulePopOut 2018-06-22 13:32:00 +09:00
smoogipoo
206f913a4c Make mute button not handle hover 2018-06-22 13:31:32 +09:00
Dean Herbert
5d3b51b8d4
Merge branch 'master' into api-offline-early-return 2018-06-22 13:16:30 +09:00
Dean Herbert
eb6d6dc2de Improve the visibility of the global loading animation
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
2018-06-22 13:14:43 +09:00
Dan Balasescu
2801c18845
Merge pull request #2469 from UselessToucan/multiple_previews_different_overlays
Centralise preview track handling
2018-06-22 13:13:07 +09:00
Dean Herbert
73e13e2d63 Rename Stop to StopAnyPlaying for clarity 2018-06-22 12:35:43 +09:00
Dean Herbert
4b2b1f51f9 Apply some code review 2018-06-22 12:33:30 +09:00
Dean Herbert
de10480e95
Merge branch 'master' into multiple_previews_different_overlays 2018-06-22 10:44:36 +09:00
Dean Herbert
91af960200
Merge pull request #2848 from peppy/notification-usability
Improve log to notification forwarding
2018-06-21 20:04:00 +09:00
Dan Balasescu
465342c636
Merge branch 'master' into notification-usability 2018-06-21 19:48:16 +09:00
smoogipoo
15bb301d14 Remove unused field 2018-06-21 19:37:45 +09:00
smoogipoo
1932399521 Add testcases 2018-06-21 19:31:07 +09:00
smoogipoo
63a6fc2596 XMLDoc all the things 2018-06-21 18:54:50 +09:00
smoogipoo
40ed3fdd05 Fix possible incorrect order of events due to threaded load 2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73 Rework preview tracks to reduce usage complexities 2018-06-21 18:40:27 +09:00
Dean Herbert
fcf7e211fa
Merge pull request #2851 from peppy/remove-dangling-files
Remove vscode files from long-gone deploy project
2018-06-21 18:34:05 +09:00
Dean Herbert
8706740825
Merge pull request #2593 from frankhjwx/catch_star_rating
Implement osu!catch star rating
2018-06-21 18:29:22 +09:00
Dean Herbert
999d3a240d Merge remote-tracking branch 'upstream/master' into frankhjwx-catch_star_rating 2018-06-21 17:49:13 +09:00
Dean Herbert
34498f7f86 Use var where possible 2018-06-21 17:49:04 +09:00
Dean Herbert
c64f64814f Remove unnecessary AimRating 2018-06-21 17:32:10 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
4982efce88 Remove vscode files from long-gone deploy project 2018-06-21 17:22:59 +09:00
Dean Herbert
c60b8bba35 Fix race condition in TestCaseLounge 2018-06-21 17:04:57 +09:00
Dean Herbert
a9cb214aa9 Replace usage of GetEnumerator 2018-06-21 16:31:33 +09:00
Dean Herbert
d00c578b05
Merge branch 'master' into catch_star_rating 2018-06-21 15:57:55 +09:00
Dean Herbert
4c14f547dd
Merge pull request #2841 from tom-arrow/taiko-mouse-input
Bind mouse clicks with only one TaikoAction
2018-06-21 14:51:09 +09:00
Dean Herbert
6ec0aaee91 Split out logic for subsequent log message and apply action to only itself 2018-06-21 14:50:42 +09:00
Dean Herbert
87d94591e4 Start displaying notifications earlier
Also show important notifications and more in total.
2018-06-21 14:43:38 +09:00
Dean Herbert
ed17a241f5 Decrease notification font size 2018-06-21 14:43:02 +09:00
Dean Herbert
566d125658 Change order of default initialisation to look better in settings 2018-06-21 14:28:40 +09:00
Dean Herbert
6aa0ca5cc9 Add (one-way) migration for existing users 2018-06-21 14:22:25 +09:00
smoogipoo
ab2889da1f Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays 2018-06-21 13:24:02 +09:00
Dean Herbert
9908957412 Merge remote-tracking branch 'upstream/master' into tom-arrow-taiko-mouse-input 2018-06-21 13:19:34 +09:00
smoogipoo
afcf91a4c5 What the... 2018-06-21 13:12:22 +09:00
Dean Herbert
498302e298
Merge pull request #2559 from KoziLord/ParallaxContainerImprovement
Add support for negative ParallaxAmount in ParallaxContainer
2018-06-21 13:06:09 +09:00
smoogipoo
9314f49bc3 Expose the catch width from the Catcher 2018-06-21 12:57:59 +09:00
Dean Herbert
74f732038f Add documentation for negative values of ParallaxAmount 2018-06-21 12:49:07 +09:00
Dean Herbert
df0083e3d9 Add tests for ParallaxContainer 2018-06-21 12:48:57 +09:00
Dean Herbert
5f2d1d4a1e Dim TestCase background a bit 2018-06-21 12:48:44 +09:00
smoogipoo
5d0c847835 Fix post-merge errors 2018-06-21 12:26:21 +09:00
smoogipoo
c9581a2d56 Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
2018-06-21 12:15:25 +09:00
Dean Herbert
733b7d1177
Merge branch 'master' into ParallaxContainerImprovement 2018-06-21 12:10:10 +09:00
smoogipoo
48989df6eb Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls 2018-06-21 11:56:56 +09:00