RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,158 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

565 Commits

Author SHA1 Message Date
Unknown 6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert 045ed741b0 Fix API getting stuck in eternal failing state if login request fails 2019-01-09 15:29:27 +09:00
Dean Herbert 276014f591
Merge branch 'master' into update-framework 2019-01-08 11:26:10 +09:00
Dean Herbert 8eedef3e86 Move cancellation to safer place 2019-01-07 19:31:05 +09:00
Dean Herbert d72412d24d Fix leaderboard not correctly handling cancellation 2019-01-07 19:28:46 +09:00
Dean Herbert f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Dean Herbert 0908309232
Merge branch 'master' into fix-room-ordering 2018-12-28 13:35:56 +09:00
smoogipoo a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
Lanyun Hou f2f1ba8cbe
Fix typo in line 42 2018-12-28 00:43:20 +08:00
Dean Herbert c5764ded1c Fix infinite polling rate in certain scenarios 2018-12-27 20:03:32 +09:00
smoogipoo dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
smoogipoo 8e031325dd CI fixes 2018-12-27 16:28:17 +09:00
smoogipoo a3b6a3981c Use .Equals() override instead of manual type checks 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 bfbd7e5106 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 22:42:24 +09:00
Dean Herbert 6b7b0af2e4 Temporary fix for participant count being nullable 2018-12-26 22:25:15 +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 fb15806c98
Merge branch 'master' into fix-webrequest-cancellation 2018-12-26 21:21:29 +09:00
smoogipoo bee4e8ad28 Fix cancelled webrequests triggering exceptions 2018-12-26 21:17:10 +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
smoogipoo be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +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 aeb2186539 Fix api get user request never failing 2018-12-26 16:06:39 +09:00
smoogipoo 6a5f0eca18 Fix various elements flashing 2018-12-25 18:07:50 +09:00
smoogipoo d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
smoogipoo 02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
smoogipoo 30dbc36fce Don't clear username on logout 2018-12-22 17:54:19 +09:00
smoogipoo d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
smoogipoo c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip 
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
 2018-12-22 16:22:02 +09:00
Dan Balasescu 2c97409e2e
Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
smoogipoo baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
smoogipoo b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
smoogipoo bdb6e03dfb Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip 
# Conflicts:
#	osu.Game/Online/Leaderboards/Leaderboard.cs
#	osu.Game/Online/Leaderboards/LeaderboardScore.cs
#	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
#	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
 2018-12-22 15:33:26 +09:00
Dean Herbert 52c6d5bfd4 Move protected method down 2018-12-22 15:23:32 +09:00
Dean Herbert 787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
Dean Herbert 23259b295c Remove unnecessary using 2018-12-22 14:45:35 +09:00
smoogipoo e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
smoogipoo 1cb69c3478 Split requests/responses into separate files 2018-12-22 12:50:37 +09:00
Dean Herbert 396caae0a9 Remove redundant newline 2018-12-21 19:01:19 +09:00
Dean Herbert 81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +09:00
smoogipoo 1df4826a1d Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-21 14:14:17 +09:00
smoogipoo 6a9b0a0ba3 Fix initial messages not being received 2018-12-21 14:02:36 +09:00
smoogipoo 6b6629e9fd Fix not posting to the correct channel 2018-12-21 14:02:29 +09:00
smoogipoo fa2bc16140 Remove participants, add match chat 2018-12-21 14:01:11 +09:00
smoogipoo e27b7b0c0d Cleanup 2018-12-21 13:06:11 +09:00
smoogipoo 5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip 
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
 2018-12-21 12:51:31 +09:00