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

49 Commits

Author SHA1 Message Date
Dean Herbert a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
Dan Balasescu 959b1ac845 Fix potential nullref when exiting multiplayer (#4227) 
Fixes https://github.com/ppy/osu/issues/3954
 2019-02-08 17:28:00 +09:00
smoogipoo 6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
smoogipoo 99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
smoogipoo 42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
smoogipoo 7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00
smoogipoo 990bd44ca2 Combine roommanager and roompollingcomponent 2019-02-08 13:01:10 +09:00
smoogipoo aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
smoogipoo d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
smoogipoo 37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
Dean Herbert b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
smoogipoo 255b4a30e0 Allow logo to be null 2019-01-31 13:50:37 +09:00
smoogipoo 58d744e5dc Remove manual overlay/toolbar logic from multiplayer 2019-01-31 13:38:21 +09:00
smoogipoo 5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
smoogipoo 91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen 
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
 2019-01-29 21:21:36 +09:00
smoogipoo 7b1c1f3728 Move toolbar showing and overlay activation to OsuGame 
Now exposed through IOsuScreen.
 2019-01-28 15:42:06 +09:00
smoogipoo 117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
smoogipoo e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
smoogipoo 95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
Dean Herbert 787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel 4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
smoogipoo 8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
ProgrammaticNajel 9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08:00
ProgrammaticNajel e4084b7d5d Add overflow padding in other multiplayer screen components 
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
 2019-01-24 17:40:48 +08:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ProgrammaticNajel 7ac20c3545 Add overflow padding to account for parallax shifting 
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
 2019-01-24 16:11:24 +08: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 bd0576537e Forcefully exit multiplayer if API loses connectivity 2018-12-27 17:12:58 +09:00
Dean Herbert cc1f3d54b0 Fix looping failure 2018-12-26 22:37:09 +09:00
Dean Herbert 5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
Dean Herbert 2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
smoogipoo 6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
smoogipoo dd0c04ea36 Move RoomManager to multiplayer screen 2018-12-22 12:45:36 +09:00
smoogipoo 822225577b Add joining/parting room requests 2018-12-20 20:58:34 +09:00
smoogipoo 9031896484 Fix create room button showing in song select 2018-12-20 20:09:17 +09:00
smoogipoo 673082445e Rework filtering 2018-12-19 16:56:51 +09:00
smoogipoo aabe6c68f5 Fix looping not working 2018-12-18 17:07:47 +09:00
smoogipoo 8d640cdc25 Fix leaderboard not being refreshed when finishing gameplay 2018-12-18 12:56:16 +09:00
smoogipoo de0fc2a0de Fix beatmap + ruleset being changeable 2018-12-14 17:35:18 +09:00
smoogipoo ca87b42758 Merge branch 'timeshift-player' 
# Conflicts:
#	osu.Game/Screens/Multi/Multiplayer.cs
 2018-12-13 17:06:44 +09:00
smoogipoo 497f431366 Implement RoomManager and RoomsContainer 
Reduces logic from LoungeScreen
 2018-12-11 19:07:40 +09:00
smoogipoo bf3f5ab685 Change ready button to "Start" and make it enter player 2018-12-11 17:32:01 +09:00
smoogipoo 1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00
Dean Herbert 0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
DrabWeb f7a4a4eeef Add Lounge FilterControl. 2018-05-22 00:24:39 -03:00
DrabWeb cae09492c3 Basic Lounge functionality. 2018-05-22 00:07:04 -03:00
DrabWeb 1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00