h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:47:24 +08:00
Code Issues Releases Wiki Activity
15,860 Commits 3 Branches 653 Tags 367 MiB
67e200e1b2
Commit Graph

15860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bfbd7e5106 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 22:42:24 +09:00
Dean Herbert
bb502769c7 Fix enum 2018-12-26 22:42:17 +09:00
Dean Herbert
cc1f3d54b0 Fix looping failure 2018-12-26 22:37:09 +09:00
Dean Herbert
6b7b0af2e4 Temporary fix for participant count being nullable 2018-12-26 22:25:15 +09:00
Dean Herbert
a2885a99cc
Merge pull request #3921 from smoogipoo/fix-webrequest-cancellation 
Fix cancelling completed webrequests throwing exceptions
 2018-12-26 22:17:01 +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
Dean Herbert
fb15806c98
Merge branch 'master' into fix-webrequest-cancellation 2018-12-26 21:21:29 +09:00
smoogipoo
2d19436456 Open -> Push 2018-12-26 21:21:26 +09:00
smoogipoo
152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
Dean Herbert
0c622ffc65 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 21:19:05 +09:00
smoogipoo
0c384417f1 Add processing overlay to room creation process 2018-12-26 21:19:02 +09:00
Dean Herbert
26834abd33 Fade and no schedule 2018-12-26 21:18:55 +09:00
smoogipoo
2e5cd8b4e3 Fix post-rebase errors 2018-12-26 21:18:44 +09:00
smoogipoo
5af29f8384 Reduce code duplication 2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00
smoogipoo
9901b11600 Display room join errors as notifications 2018-12-26 21:18:11 +09:00
smoogipoo
bee4e8ad28 Fix cancelled webrequests triggering exceptions 2018-12-26 21:17:10 +09:00
Dean Herbert
bef3c585c3
Merge pull request #3912 from peppy/updateable-beatmap-sprite 
Add Updateable beatmap sprite
 2018-12-26 20:56:04 +09:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip 
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
 2018-12-26 20:52:36 +09:00
Dean Herbert
ae47eb61ca Fix test not working when not logged in 2018-12-26 20:42:47 +09:00
Dean Herbert
8386e206c3 Update ParticipantInfo 2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b Move PartRoom calls 2018-12-26 20:35:54 +09:00
smoogipoo
23d412e3ff Fix post-rebase errors 2018-12-26 20:33:49 +09:00
smoogipoo
9d305ba024 Reduce code duplication 2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a Display room join errors as notifications 2018-12-26 20:32:36 +09:00
Dean Herbert
7a431ed87f Update ParticipantInfo 2018-12-26 20:31:04 +09:00
Dean Herbert
869081ce9c Open -> Push 2018-12-26 20:21:30 +09:00
Dean Herbert
692f5c289d Move PartRoom calls 2018-12-26 20:12:51 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert
532a970c0f Give leaderboard and chat more breathing room 2018-12-26 19:20:54 +09:00
Dean Herbert
0cefd4b21d Improve room padding 2018-12-26 19:14:15 +09:00
Dean Herbert
e317b047f8 Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite 2018-12-26 18:49:41 +09:00
Dean Herbert
edfb027ff2 Update framework 2018-12-26 18:49:33 +09:00
Dan Balasescu
029bbbc869
Merge pull request #3917 from peppy/better-login-messaging 
Add better messaging when connecting or failing
 2018-12-26 18:35:34 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
Dean Herbert
f442e59620 Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
smoogipoo
a8d0ff67a9 Add automated match settings overlay tests 2018-12-26 16:34:38 +09:00
Dean Herbert
7c1e3d66eb
Merge pull request #3916 from smoogipoo/fix-getuser-request-failing 
Fix API get user request never failing
 2018-12-26 16:32:01 +09:00
smoogipoo
aeb2186539 Fix api get user request never failing 2018-12-26 16:06:39 +09:00
Dean Herbert
b2fb027097 Remove old testcase 2018-12-26 15:26:46 +09:00