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

117 Commits

Author SHA1 Message Date
Dean Herbert d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
Dean Herbert 272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
Dean Herbert 78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
Dean Herbert e4422167b6 Fix starting gameplay 2019-02-11 19:13:57 +09:00
Dean Herbert 88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
Dean Herbert a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
Dean Herbert f52cac966b Fix multiple blank lines 2019-02-08 18:45:32 +09:00
Dean Herbert 6c4d289901 Pass item rather than ID 2019-02-08 18:33:49 +09:00
Dan Balasescu 7ec0b4ba77 Fix nullref during room creation (#4228) 2019-02-08 17:53:01 +09:00
smoogipoo 5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
smoogipoo 43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
smoogipoo 17fdfc15d9 Fix room title in the breadcrumbs 2019-02-07 20:09:49 +09:00
smoogipoo 4f86fe92ea Fix match settings not showing 2019-02-06 18:50:43 +09:00
smoogipoo 594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
smoogipoo aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
smoogipoo b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +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 60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
smoogipoo b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +09:00
smoogipoo e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
smoogipoo da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
smoogipoo 15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +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
ProgrammaticNajel 593e0b36f5 Add overflow padding in other multiplayer screen components 
Added padding to Room Creation and Beatmap Selection in Multiplayer.
 2019-01-24 19:42:35 +08:00
smoogipoo 8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09: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
Dean Herbert 491537b8ba Add fade duration 
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
 2019-01-17 18:13:05 +09:00
ekrctb 2bc3464802 Hide Room tab when Settings tab is active 2019-01-17 17:27:34 +09:00
smoogipoo 122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
Dean Herbert 2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +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 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
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 8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +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
smoogipoo 152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +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 940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00