1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

20895 Commits

Author SHA1 Message Date
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting 2019-08-05 17:11:48 +09:00
Dean Herbert
379c9e8b7c Use expression body 2019-08-05 10:02:28 +02:00
Dean Herbert
431834fc2f Merge remote-tracking branch 'upstream/master' into conversion-test-mods 2019-08-05 09:50:43 +02:00
Dean Herbert
9fab345d79
Refactor beatmap conversion testing (#5555)
Refactor beatmap conversion testing

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-05 09:45:30 +02:00
Dean Herbert
515d53c360
Fix settings sidebar showing scrollbar at max ui scale (#5590)
Fix settings sidebar showing scrollbar at max ui scale

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-08-05 07:01:37 +02:00
Dan Balasescu
b20f1d1717
Merge branch 'master' into fix-settings-sidebar-max-ui-scale 2019-08-05 13:42:04 +09:00
Dan Balasescu
9d0639e700
Merge pull request #5597 from EVAST9919/profile-ruleset-selector-improvements
Refactor profile ruleset selector
2019-08-05 13:41:49 +09:00
Dan Balasescu
b9c406f3b2
Merge branch 'master' into profile-ruleset-selector-improvements 2019-08-05 13:31:23 +09:00
smoogipoo
d839717131 Remove unnecessary intermediate method 2019-08-05 13:18:29 +09:00
Max Hübner
2f5d23b354 add join command 2019-08-05 01:02:42 +02:00
Dean Herbert
d5be87c06a
Update heart colour of supporter icon (#5594)
Update heart colour of supporter icon
2019-08-04 16:07:25 +02:00
Andrei Zavatski
cd7b6d2d27 TestCase improvement 2019-08-04 15:00:02 +03:00
Andrei Zavatski
d693a54c84 Move RankHistoryData to User Statistics 2019-08-04 14:35:26 +03:00
Dean Herbert
b0a27161c6
Merge pull request #5588 from UselessToucan/update_ef_core
Update Entity Framework Core
2019-08-04 13:16:00 +02:00
Andrei Zavatski
3ae5428dad ProfileRulesetSelector improvements 2019-08-04 14:15:16 +03:00
Andrei Zavatski
8fde92c595 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-ruleset-selector-improvements 2019-08-04 14:15:11 +03:00
Dean Herbert
a708d5d079
Merge pull request #5596 from EVAST9919/dimmed-loading
Move DimmedLoadingLayer to its own file
2019-08-04 13:07:10 +02:00
Andrei Zavatski
fd44ca3233 Rename Animation to Layer 2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1 Move DimmedLoadingAnimation to it's own file 2019-08-04 11:09:12 +03:00
Andrei Zavatski
c8acbdb1d9 Update the colour 2019-08-04 06:15:15 +03:00
Joehu
f6f96658c7 Fix settings sidebar being behind toolbar 2019-08-03 15:22:06 -07:00
Joehu
115cf47ed5 Fix settings sidebar showing scrollbar at max ui scale 2019-08-03 15:20:44 -07:00
Roman Kapustin
c8dd29067b Update Entity Framework Core 2019-08-04 00:34:51 +03:00
Dean Herbert
3a21a9e0ed
Merge pull request #5580 from Joehuu/mod-filter-hover-sound
Add hover click sounds to leaderboard mod filter
2019-08-03 19:03:34 +02:00
Dean Herbert
d97aa83fe1
Merge pull request #5558 from dtsdao/undo-ios-plist-change
Revert iOS import changes causing crash
2019-08-03 15:30:39 +02:00
Joehu
b244b2fe3d Add hover click sounds to leaderboard mod filter 2019-08-02 21:13:29 -07:00
Joehu
0082695cd8 Choose default category sorting instead of being always first 2019-08-02 13:22:58 -07:00
Joehu
e84c79d140 Update osu!direct categories sorting with web changes 2019-08-02 13:16:33 -07:00
Dan Balasescu
1d1fd91275
Merge pull request #5548 from iiSaLMaN/fix-music-controller-skipping-more-than-once
Fix Music Controller skipping more than once
2019-08-02 15:01:22 +09:00
Dean Herbert
fc0a938b83
Merge branch 'master' into fix-music-controller-skipping-more-than-once 2019-08-02 07:42:19 +02:00
Dean Herbert
daeed4767f
Merge branch 'master' into refactor-conversion-test 2019-08-02 07:42:12 +02:00
Dean Herbert
7a89476688
Update cake to resolve CI issues (#5566)
Update cake to resolve CI issues
2019-08-02 07:40:59 +02:00
smoogipoo
ba3f8a643a Update cake 2019-08-02 14:19:11 +09:00
Dan Balasescu
7076c9a882
Merge branch 'master' into fix-music-controller-skipping-more-than-once 2019-08-02 14:03:38 +09:00
Dean Herbert
0e0c2e3333
Merge branch 'master' into refactor-conversion-test 2019-08-02 06:32:10 +02:00
Dean Herbert
770b228fdb
Fix ticks in repeat spans being returned in reverse order (#5559)
Fix ticks in repeat spans being returned in reverse order
2019-08-02 06:31:11 +02:00
Dean Herbert
69c2723d90
Merge branch 'master' into refactor-conversion-test 2019-08-02 05:34:05 +02:00
Dan Balasescu
ccb989a191
Merge pull request #5552 from UselessToucan/do_not_check_cursor_visibility_on_each_update
Remove redundant ScreenshotManager.Update override
2019-08-02 00:47:14 +09:00
Dan Balasescu
67b6964eb6
Merge branch 'master' into do_not_check_cursor_visibility_on_each_update 2019-08-01 19:46:01 +09:00
Dan Balasescu
6e718664e1
Merge pull request #5557 from EVAST9919/user-loved
Add loved beatmaps section into user overlay
2019-08-01 19:43:14 +09:00
smoogipoo
e9eea7157d Trim unnecessary file contents 2019-08-01 18:04:57 +09:00
smoogipoo
2ae8cba24d Add hardrock spinner test 2019-08-01 17:58:20 +09:00
smoogipoo
a7376c6027 Merge remote-tracking branch 'smoogipoo/fix-slider-generation-order' into fix-catch-hr
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
2019-08-01 17:43:33 +09:00
smoogipoo
0ff1c6184b Add generation comment 2019-08-01 17:36:20 +09:00
smoogipoo
f2b940f930 Add tests 2019-08-01 17:31:37 +09:00
smoogipoo
a2468e599b Fix ticks in repeat spans being returned in reverse order 2019-08-01 17:31:37 +09:00
Andrei Zavatski
0f36088ef8 Add loved section 2019-08-01 11:06:29 +03:00
iiSaLMaN
d772bbaf8c Simplify disposing 2019-08-01 10:04:04 +03:00
smoogipoo
b978727422 Add stream + repeat slider tests 2019-08-01 14:58:17 +09:00
smoogipoo
8a1d690011 Reset tick offsets 2019-08-01 14:57:54 +09:00