1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

3352 Commits

Author SHA1 Message Date
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
Dean Herbert
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +09:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
Dean Herbert
6ce08312b2
Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +09:00
smoogipoo
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
smoogipoo
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
smoogipoo
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Dean Herbert
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
Dean Herbert
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
smoogipoo
72482aff8d Whoops 2018-12-28 01:48:13 +09:00
smoogipoo
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
Dean Herbert
12a93af156
Merge pull request #3939 from smoogipoo/fix-multi-mods
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
smoogipoo
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00
Dean Herbert
2d1736e477
Merge pull request #3936 from smoogipoo/fix-multi-mods
Ensure mods are set prior to starting play
2018-12-27 22:04:35 +09:00
smoogipoo
101fdf993e Ensure mods are set prior to starting play 2018-12-27 21:59:43 +09:00
Dean Herbert
5977fc838f Limit available durations for the time being 2018-12-27 21:59:08 +09:00
smoogipoo
50b51a168e Always submit standardised scores 2018-12-27 21:12:32 +09:00
Dean Herbert
31baf0086f Optional idle tracker 2018-12-27 20:17:27 +09:00
Dean Herbert
1ce33cb6da Adjust polling rate based on current screen and idle state 2018-12-27 20:06:07 +09:00
smoogipoo
eaba9e1378 Fix mode icon not being updated for correct ruleset 2018-12-27 18:16:30 +09:00
smoogipoo
9a5630b3d5 Fix working beatmap not being updated 2018-12-27 18:16:30 +09:00
Dean Herbert
d6c53e3851 Cancel old web requests when changing filter modes 2018-12-27 18:09:42 +09:00
smoogipoo
b0e8561ad3 Fix ruleset not changing correctly 2018-12-27 17:48:10 +09:00
smoogipoo
dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
phosphene47
3c677970cd Add menu background skinning for supporters 2018-12-27 17:25:28 +09:00
smoogipoo
ea1309e768 Fix missing bind 2018-12-27 17:15:43 +09:00
smoogipoo
bd0576537e Forcefully exit multiplayer if API loses connectivity 2018-12-27 17:12:58 +09:00
smoogipoo
f70e60747f Remove option for 1-minute duration 2018-12-27 16:54:14 +09:00
smoogipoo
8e031325dd CI fixes 2018-12-27 16:28:17 +09:00
smoogipoo
50201e602e Combine implementations of status + end date info 2018-12-27 16:19:00 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4 Add + set ended room status 2018-12-27 13:32:44 +09:00
Dean Herbert
cc1f3d54b0 Fix looping failure 2018-12-26 22:37:09 +09:00
Dean Herbert
f6aa6e6b3c Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip 2018-12-26 22:16:41 +09:00
Dean Herbert
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
smoogipoo
e7310a16c7 Fix playlist not updating correcly 2018-12-26 22:14:49 +09:00
Dean Herbert
a1fa914c66 Participants 2018-12-26 21:58:14 +09:00
Dean Herbert
bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
#	osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/IRoomManager.cs
#	osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
#	osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00